diff options
| author | Continuous Integration <ci@zabbix.com> | 2021-10-15 20:00:52 +0300 |
|---|---|---|
| committer | Continuous Integration <ci@zabbix.com> | 2021-10-15 20:00:52 +0300 |
| commit | f212f6e7175de456805e1ca5a65d5f156ab188a4 (patch) | |
| tree | 47d5302c5928e2b478eb57f788a9cf99e87b99c4 /ui/locale | |
| parent | 3255a5d1e8a5597aeac9a8fb62319c6ba5c883a0 (diff) | |
.......... [ZBX-1357] automatic translation file sync for trunk
Diffstat (limited to 'ui/locale')
32 files changed, 20787 insertions, 23253 deletions
diff --git a/ui/locale/bg/LC_MESSAGES/frontend.po b/ui/locale/bg/LC_MESSAGES/frontend.po index 7b2403a090d..8967b406480 100644 --- a/ui/locale/bg/LC_MESSAGES/frontend.po +++ b/ui/locale/bg/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2013-01-12 23:52+0300\n" "Last-Translator: Fahri <fahri_hasan@hotmail.com>\n" "Language-Team: \n" @@ -500,7 +500,7 @@ msgstr "Потвърждавам" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Потвърдено" @@ -599,7 +599,7 @@ msgstr "" msgid "Action \"%1$s\" no operations defined." msgstr "" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -725,7 +725,7 @@ msgstr "Активно до" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -736,7 +736,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -992,7 +992,7 @@ msgstr "Възраст по-малка от" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1314,7 +1314,7 @@ msgstr "В (час:минута)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1323,8 +1323,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1335,6 +1335,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1346,7 +1351,7 @@ msgstr "Трябва да бъдат създаден най-малко един msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1432,7 +1437,7 @@ msgstr "Автентификация" msgid "Authentication algorithm" msgstr "Алгоритъм за автентификация" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1481,7 +1486,7 @@ msgstr "" msgid "Auto-login" msgstr "Автоматичен вход" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1492,7 +1497,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1752,7 +1757,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1787,7 +1792,7 @@ msgstr "Обратно повикване" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1993,7 +1998,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2116,7 +2121,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Не може да се изтрие Zabbix вътрешен потребител \"%1$s\", опитайте с изключване на този потребител." @@ -2125,7 +2130,7 @@ msgstr "Не може да се изтрие Zabbix вътрешен потре msgid "Cannot delete action" msgstr "Не може да се изтрие действието" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2193,7 +2198,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2265,7 +2270,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "Не може да се изтрие проксито" msgstr[1] "Не може да се изтрие проксито" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2288,7 +2293,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "Не може да се изтрие скрипта" msgstr[1] "Не може да се изтрие скрипта" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Не може да се изтрият скриптовете. Скрипт \"%1$s\" се използва в операция на действие \"%2$s\"." @@ -2685,16 +2690,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2707,7 +2712,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "" msgstr[1] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "" @@ -2728,7 +2733,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2790,7 +2795,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Не може да се преименува гост потребителя." @@ -2873,7 +2878,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Не може да се премахнат и изчистят уеб сценариите." @@ -2886,7 +2891,7 @@ msgstr "Не може да се премахне шаблона" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2948,8 +2953,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -3009,9 +3015,7 @@ msgstr "" msgid "Cannot update group" msgstr "Не може да се актуализира групата" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -3095,12 +3099,12 @@ msgstr "Не може да се актуализира картата на мр msgid "Cannot update proxy" msgstr "Не може да се актуализира проксито" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3120,9 +3124,9 @@ msgstr "" msgid "Cannot update script" msgstr "Не може да се актуализира скрипта" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3305,8 +3309,8 @@ msgid "Character string not included" msgstr "Не включва символен низ " #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3482,7 +3486,7 @@ msgstr "Часовник" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3520,13 +3524,13 @@ msgstr "Затвори" msgid "Close expression constructor" msgstr "Затвори израз конструктора" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3623,7 +3627,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3634,11 +3638,6 @@ msgstr "Условие" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3654,11 +3653,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3851,7 +3845,7 @@ msgstr "Потвърждение текст" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4053,12 +4047,11 @@ msgstr "Копирай" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4085,16 +4078,6 @@ msgid_plural "Correlations enabled" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4105,8 +4088,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Число" @@ -4479,7 +4462,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS име" @@ -4754,8 +4737,8 @@ msgstr "Дек" msgid "December" msgstr "Декември" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4765,7 +4748,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4862,7 +4845,7 @@ msgstr "Закъснение с" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4912,7 +4895,7 @@ msgstr "Изтриване и изчистване на шаблона? (Вни msgid "Delete current action?" msgstr "Изтриване на текущото действие?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5211,7 +5194,7 @@ msgstr "" msgid "Dependencies" msgstr "Зависимости" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Зависим" @@ -5219,7 +5202,7 @@ msgstr "Зависим" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5428,10 +5411,10 @@ msgstr "" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5514,7 +5497,7 @@ msgid "Discovery by proxy" msgstr "Откриване чрез прокси" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Проверка за откриване" @@ -5526,7 +5509,7 @@ msgstr "Проверки за откриване" msgid "Discovery list" msgstr "Списък за откриване" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Обект за откриване" @@ -5626,7 +5609,7 @@ msgstr "Правило за откриване актуализирано" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5637,7 +5620,7 @@ msgstr "Правила за откриване" msgid "Discovery rules deleted" msgstr "Правила за откриване изтрити" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Статус на откриване" @@ -5793,18 +5776,6 @@ msgstr "" msgid "Draw style" msgstr "Стил на рисуване" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5817,11 +5788,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5981,10 +5947,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6011,11 +5973,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6200,7 +6160,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6211,7 +6171,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6254,7 +6214,7 @@ msgid "English (en_US)" msgstr "Английски (US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6330,7 +6290,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6365,11 +6325,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6705,7 +6665,6 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7073,7 +7032,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Като се има предвид, израза не е макро" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7318,12 +7277,12 @@ msgstr "Решетка" msgid "Group" msgstr "Група" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7656,7 +7615,7 @@ msgstr[1] "Хост" msgid "Host \"%1$s\" already exists." msgstr "Хост \"%1$s\" вече съществува." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7664,7 +7623,7 @@ msgstr "Хост \"%1$s\" вече съществува." msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7735,17 +7694,17 @@ msgstr[1] "" msgid "Host group" msgstr "Хост група" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Хост група \"%1$s\" вече съществува." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7759,9 +7718,9 @@ msgid "Host group label type" msgstr "Тип етикет на хост група" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7777,8 +7736,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7965,7 +7924,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8053,7 +8012,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP адрес" @@ -8078,7 +8037,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8136,12 +8095,12 @@ msgstr "Икона изпъкване" msgid "Icon map" msgstr "Съответствие на икона" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, fuzzy, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Съответствие на икона \"%1$s\" не може да бъде изтрита. Използва се в картата на мрежата \"%2$s\"." @@ -8169,7 +8128,7 @@ msgstr "Съответствие на икона актуализирана" msgid "Icon mapping" msgstr "Съответствие на икона" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8400,7 +8359,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8413,11 +8372,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8629,24 +8588,6 @@ msgstr "Неправилно действие в операция потреби msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Неправилно действие в операция потребител. Потребителя не съществува или нямате права за достъп до него." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8731,20 +8672,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8809,11 +8741,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8921,7 +8848,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -9035,11 +8962,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9061,10 +8983,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9126,18 +9048,6 @@ msgstr "Неправилна стойност \"%1$s\" за поле цяло ч msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Неправилна стойност \"%1$s\" за поле цяло положително число \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9199,12 +9109,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9316,7 +9220,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9327,9 +9231,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9480,7 +9384,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Вмъкване" @@ -9608,7 +9512,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Интервал" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9631,7 +9535,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9645,7 +9549,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9692,9 +9596,11 @@ msgstr "Невалидни параметри на метода." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9734,17 +9640,17 @@ msgstr "Невалидни параметри на метода." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9752,14 +9658,14 @@ msgstr "Невалидни параметри на метода." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9767,111 +9673,116 @@ msgstr "Невалидни параметри на метода." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10082,7 +9993,7 @@ msgstr[1] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10261,7 +10172,7 @@ msgstr "Елементи на данните актуализирани" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10454,7 +10365,7 @@ msgstr "Разположение на етикет" msgid "Language" msgstr "Език" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11055,7 +10966,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11297,7 +11208,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11322,7 +11233,7 @@ msgstr "Уведомления" msgid "Media type" msgstr "Метод на уведомление" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11368,7 +11279,7 @@ msgstr "" msgid "Media type updated" msgstr "Метод на уведомление актуализирано" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11380,7 +11291,7 @@ msgstr "" msgid "Media types" msgstr "Методи на уведомление" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11628,7 +11539,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12030,15 +11941,17 @@ msgstr "" msgid "New element" msgstr "Нов елемент" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12058,7 +11971,7 @@ msgstr "" msgid "New service time" msgstr "Ново време за услуга" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12085,7 +11998,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12114,30 +12027,6 @@ msgstr "" msgid "No" msgstr "Не" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12187,11 +12076,6 @@ msgstr "Не е уточнено потребителското име за ав msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12330,17 +12214,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Нямате право на достъп до системата." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12376,10 +12289,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12407,13 +12319,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12433,8 +12350,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12457,24 +12374,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12496,16 +12413,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12561,7 +12478,7 @@ msgstr "Не са дефинирани тригери." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12631,15 +12548,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Не е позволено да зададете парола за потребителя \"гост\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12973,15 +12890,16 @@ msgstr "Изкл" msgid "Ok" msgstr "Ок" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -13003,10 +12921,6 @@ msgstr "Веднъж" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Само един път" @@ -13016,10 +12930,6 @@ msgstr "Само един път" msgid "One-time downtime" msgstr "Еднократна недостъпност" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Само Супер Администраторите могат да създават хост групи." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -13068,10 +12978,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13080,10 +12986,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Преброени са само тригерите възложени за активни хостове и зависими от активни елементи на данните" @@ -13132,7 +13034,7 @@ msgstr "Операцията няма шаблон за да функциони msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13141,33 +13043,33 @@ msgstr "" msgid "Operations" msgstr "Операции" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Оператор" @@ -13576,16 +13478,16 @@ msgstr "" msgid "Parameter" msgstr "Параметър" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13722,7 +13624,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13768,7 +13670,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13901,7 +13803,7 @@ msgstr "Попълнете полето: данни за инвентариза #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14222,7 +14124,7 @@ msgstr "Проксита" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14230,7 +14132,7 @@ msgstr "Проксита" msgid "Proxy" msgstr "Прокси" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14240,12 +14142,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Прокси \"%1$s\" за хост \"%2$s\" не съществува." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Прокси \"%1$s\" се използва от правило за откриване \"%2$s\"." @@ -14520,7 +14422,7 @@ msgstr "" msgid "Regular expression" msgstr "Регулярен израз" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14780,7 +14682,7 @@ msgid "Replace dependencies" msgstr "Смени зависимостите" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14977,7 +14879,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Резултат" @@ -15218,7 +15120,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15516,7 +15418,7 @@ msgstr "" msgid "Script" msgstr "Скрипт" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15630,7 +15532,7 @@ msgid "Security name" msgstr "Име на сигурност" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15845,11 +15747,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Времето за стартиране на услугата трябва да бъде по-малко от крайното време." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15861,7 +15763,7 @@ msgstr "" msgid "Service times" msgstr "Интервали от време за услуга" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Тип услуга" @@ -15874,7 +15776,7 @@ msgstr "" msgid "Service updated" msgstr "Услуга актуализирана" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15886,7 +15788,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15904,9 +15806,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Сесията е прекратена, моля влезте повторно в системата." @@ -15968,7 +15870,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16813,10 +16715,10 @@ msgstr "Таблица \"%1$s\" няма поле с име \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Етикет" @@ -16953,7 +16855,7 @@ msgstr "Шаблон" msgid "Template \"%1$s\" already exists." msgstr "Шаблон \"%1$s\" вече съществува." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17037,7 +16939,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17334,7 +17236,7 @@ msgstr "До" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17741,7 +17643,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17805,9 +17707,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17817,7 +17719,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17869,7 +17771,7 @@ msgstr "Тип на информацията" msgid "Types" msgstr "Типове" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17940,8 +17842,8 @@ msgstr "" msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18051,21 +17953,23 @@ msgstr "Единици за измерване" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Неизвестно" @@ -18083,7 +17987,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Неизвестен елемент на данните за хост, няма такъв елемент на данните в избрания хост" @@ -18222,7 +18126,7 @@ msgstr "Достъпен" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18357,37 +18261,37 @@ msgstr "Използва се в действия" msgid "User" msgstr "Потребител" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18409,13 +18313,13 @@ msgstr "Потребител добавен" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Потребителят не може да добави себе си към изключена група или група с изключен GUI достъп." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18439,27 +18343,27 @@ msgstr[1] "" msgid "User group" msgstr "Потребителска група" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Потребителска група \"%1$s\" се използва в скрипт \"%2$s\"." @@ -18493,9 +18397,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18510,7 +18414,7 @@ msgstr "" msgid "User groups" msgstr "Потребителски групи" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Не е позполено на потребителя да изтрие себе си." @@ -18545,7 +18449,7 @@ msgstr "Потребителски профил" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18564,7 +18468,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18614,12 +18518,12 @@ msgstr "Потребител актуализиран" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18930,14 +18834,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19049,11 +18953,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19591,7 +19496,7 @@ msgstr "Ежегодно" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19649,7 +19554,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19782,11 +19686,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19794,16 +19698,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19812,37 +19716,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19863,7 +19767,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19871,19 +19775,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19933,7 +19837,7 @@ msgstr "Всички" msgid "all media" msgstr "всички уведомления" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19955,23 +19859,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19981,7 +19885,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19989,11 +19893,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20154,13 +20062,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20191,13 +20093,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20215,14 +20117,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20295,7 +20197,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20386,7 +20289,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20408,13 +20311,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20440,7 +20343,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20477,7 +20381,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20568,7 +20472,7 @@ msgstr "икона" msgid "image" msgstr "изображение" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20613,15 +20517,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20649,7 +20557,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20678,27 +20586,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20726,7 +20634,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20876,7 +20784,7 @@ msgstr "" msgid "max" msgstr "макс" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20916,7 +20824,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20943,8 +20851,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "милисекунда" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20965,8 +20873,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21182,6 +21090,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21227,11 +21139,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21243,15 +21155,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21299,7 +21211,7 @@ msgstr "" msgid "short description" msgstr "кратко описание" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21318,15 +21230,15 @@ msgstr "кратко описание" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21343,31 +21255,31 @@ msgstr "покажи съответствие на икони" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21375,15 +21287,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21396,7 +21308,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21407,7 +21319,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21416,14 +21328,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "шаблон с ID \"%1$s\" е изпълнен %2$s пъти" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21435,20 +21347,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21480,7 +21392,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21488,31 +21400,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21526,7 +21438,7 @@ msgstr "тригер" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21538,11 +21450,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21551,7 +21463,7 @@ msgstr "" msgid "type here to search" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21599,11 +21511,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21629,8 +21542,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21655,6 +21568,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21712,61 +21629,69 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21797,15 +21722,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21814,7 +21737,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21827,11 +21750,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/ca/LC_MESSAGES/frontend.po b/ui/locale/ca/LC_MESSAGES/frontend.po index 6098ab03f68..57ede26025f 100644 --- a/ui/locale/ca/LC_MESSAGES/frontend.po +++ b/ui/locale/ca/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2021-03-19 18:10+0300\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: none\n" @@ -499,7 +499,7 @@ msgstr "" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "" @@ -598,7 +598,7 @@ msgstr "" msgid "Action \"%1$s\" no operations defined." msgstr "" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -724,7 +724,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -735,7 +735,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -991,7 +991,7 @@ msgstr "" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1313,7 +1313,7 @@ msgstr "" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1322,8 +1322,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1334,6 +1334,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1345,7 +1350,7 @@ msgstr "" msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1431,7 +1436,7 @@ msgstr "" msgid "Authentication algorithm" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1480,7 +1485,7 @@ msgstr "" msgid "Auto-login" msgstr "" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1491,7 +1496,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1750,7 +1755,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1785,7 +1790,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1991,7 +1996,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2113,7 +2118,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "" @@ -2122,7 +2127,7 @@ msgstr "" msgid "Cannot delete action" msgstr "" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2188,7 +2193,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2259,7 +2264,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2282,7 +2287,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "" @@ -2675,16 +2680,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2697,7 +2702,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "" msgstr[1] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "" @@ -2718,7 +2723,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2780,7 +2785,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "" @@ -2863,7 +2868,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "" @@ -2876,7 +2881,7 @@ msgstr "" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2938,8 +2943,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -2999,9 +3005,7 @@ msgstr "" msgid "Cannot update group" msgstr "" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -3084,12 +3088,12 @@ msgstr "" msgid "Cannot update proxy" msgstr "" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3109,9 +3113,9 @@ msgstr "" msgid "Cannot update script" msgstr "" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3294,8 +3298,8 @@ msgid "Character string not included" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3471,7 +3475,7 @@ msgstr "" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3509,13 +3513,13 @@ msgstr "" msgid "Close expression constructor" msgstr "" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3612,7 +3616,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3623,11 +3627,6 @@ msgstr "" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3643,11 +3642,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3839,7 +3833,7 @@ msgstr "" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4041,12 +4035,11 @@ msgstr "" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4073,16 +4066,6 @@ msgid_plural "Correlations enabled" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4093,8 +4076,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "" @@ -4466,7 +4449,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "" @@ -4741,8 +4724,8 @@ msgstr "" msgid "December" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4752,7 +4735,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4849,7 +4832,7 @@ msgstr "" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4899,7 +4882,7 @@ msgstr "" msgid "Delete current action?" msgstr "" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5197,7 +5180,7 @@ msgstr "" msgid "Dependencies" msgstr "" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "" @@ -5205,7 +5188,7 @@ msgstr "" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5414,10 +5397,10 @@ msgstr "" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5500,7 +5483,7 @@ msgid "Discovery by proxy" msgstr "" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "" @@ -5512,7 +5495,7 @@ msgstr "" msgid "Discovery list" msgstr "" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "" @@ -5611,7 +5594,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5622,7 +5605,7 @@ msgstr "" msgid "Discovery rules deleted" msgstr "" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "" @@ -5778,18 +5761,6 @@ msgstr "" msgid "Draw style" msgstr "" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5802,11 +5773,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5966,10 +5932,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -5996,11 +5958,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6185,7 +6145,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6196,7 +6156,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6239,7 +6199,7 @@ msgid "English (en_US)" msgstr "" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6314,7 +6274,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6349,11 +6309,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6689,7 +6649,6 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7057,7 +7016,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7302,12 +7261,12 @@ msgstr "" msgid "Group" msgstr "" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7639,7 +7598,7 @@ msgstr[1] "" msgid "Host \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7647,7 +7606,7 @@ msgstr "" msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7718,17 +7677,17 @@ msgstr[1] "" msgid "Host group" msgstr "" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7742,9 +7701,9 @@ msgid "Host group label type" msgstr "" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7760,8 +7719,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7948,7 +7907,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8036,7 +7995,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "" @@ -8061,7 +8020,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8118,12 +8077,12 @@ msgstr "" msgid "Icon map" msgstr "" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "" @@ -8147,7 +8106,7 @@ msgstr "" msgid "Icon mapping" msgstr "" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8378,7 +8337,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8391,11 +8350,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8607,24 +8566,6 @@ msgstr "" msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "" -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8709,20 +8650,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8787,11 +8719,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8899,7 +8826,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -9013,11 +8940,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9039,10 +8961,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9104,18 +9026,6 @@ msgstr "" msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9177,12 +9087,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9294,7 +9198,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9305,9 +9209,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9458,7 +9362,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "" @@ -9586,7 +9490,7 @@ msgstr "" msgid "Interval" msgstr "" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9609,7 +9513,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9623,7 +9527,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9670,9 +9574,11 @@ msgstr "" #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9712,17 +9618,17 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9730,14 +9636,14 @@ msgstr "" #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9745,111 +9651,116 @@ msgstr "" #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10060,7 +9971,7 @@ msgstr[1] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10239,7 +10150,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10432,7 +10343,7 @@ msgstr "" msgid "Language" msgstr "" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11033,7 +10944,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11275,7 +11186,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11300,7 +11211,7 @@ msgstr "" msgid "Media type" msgstr "" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11344,7 +11255,7 @@ msgstr "" msgid "Media type updated" msgstr "" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11356,7 +11267,7 @@ msgstr "" msgid "Media types" msgstr "" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11603,7 +11514,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12005,15 +11916,17 @@ msgstr "" msgid "New element" msgstr "" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12033,7 +11946,7 @@ msgstr "" msgid "New service time" msgstr "" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12060,7 +11973,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12089,30 +12002,6 @@ msgstr "" msgid "No" msgstr "" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12162,11 +12051,6 @@ msgstr "" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12305,17 +12189,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12351,10 +12264,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12382,13 +12294,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12408,8 +12325,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12432,24 +12349,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12471,16 +12388,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12536,7 +12453,7 @@ msgstr "" msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12606,15 +12523,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12948,15 +12865,16 @@ msgstr "" msgid "Ok" msgstr "" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12978,10 +12896,6 @@ msgstr "" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "" @@ -12991,10 +12905,6 @@ msgstr "" msgid "One-time downtime" msgstr "" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "" - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -13043,10 +12953,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13055,10 +12961,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "" @@ -13107,7 +13009,7 @@ msgstr "" msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13116,33 +13018,33 @@ msgstr "" msgid "Operations" msgstr "" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "" @@ -13551,16 +13453,16 @@ msgstr "" msgid "Parameter" msgstr "" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13697,7 +13599,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13743,7 +13645,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13876,7 +13778,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14196,7 +14098,7 @@ msgstr "" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14204,7 +14106,7 @@ msgstr "" msgid "Proxy" msgstr "" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14214,12 +14116,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "" -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "" @@ -14494,7 +14396,7 @@ msgstr "" msgid "Regular expression" msgstr "" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14754,7 +14656,7 @@ msgid "Replace dependencies" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14951,7 +14853,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "" @@ -15192,7 +15094,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15490,7 +15392,7 @@ msgstr "" msgid "Script" msgstr "" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15604,7 +15506,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15818,11 +15720,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "" -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15834,7 +15736,7 @@ msgstr "" msgid "Service times" msgstr "" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "" @@ -15847,7 +15749,7 @@ msgstr "" msgid "Service updated" msgstr "" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15859,7 +15761,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15877,9 +15779,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "" @@ -15941,7 +15843,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16786,10 +16688,10 @@ msgstr "" #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "" @@ -16926,7 +16828,7 @@ msgstr "" msgid "Template \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17010,7 +16912,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17307,7 +17209,7 @@ msgstr "" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17714,7 +17616,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17778,9 +17680,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17790,7 +17692,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17842,7 +17744,7 @@ msgstr "" msgid "Types" msgstr "" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17913,8 +17815,8 @@ msgstr "" msgid "URLs" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18024,21 +17926,23 @@ msgstr "" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "" @@ -18056,7 +17960,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "" @@ -18195,7 +18099,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18329,37 +18233,37 @@ msgstr "" msgid "User" msgstr "" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18381,13 +18285,13 @@ msgstr "" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "" #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18411,27 +18315,27 @@ msgstr[1] "" msgid "User group" msgstr "" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "" @@ -18465,9 +18369,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18482,7 +18386,7 @@ msgstr "" msgid "User groups" msgstr "" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "" @@ -18517,7 +18421,7 @@ msgstr "" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18536,7 +18440,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18586,12 +18490,12 @@ msgstr "" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18902,14 +18806,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19021,11 +18925,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19562,7 +19467,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19619,7 +19524,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19752,11 +19656,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19764,16 +19668,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19782,37 +19686,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19833,7 +19737,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19841,19 +19745,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19903,7 +19807,7 @@ msgstr "" msgid "all media" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19925,23 +19829,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19951,7 +19855,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19959,11 +19863,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20124,13 +20032,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20161,13 +20063,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20185,14 +20087,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20265,7 +20167,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20356,7 +20259,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20378,13 +20281,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20410,7 +20313,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20447,7 +20351,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20538,7 +20442,7 @@ msgstr "" msgid "image" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20583,15 +20487,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20619,7 +20527,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20648,27 +20556,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20696,7 +20604,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20846,7 +20754,7 @@ msgstr "" msgid "max" msgstr "" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20886,7 +20794,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20913,8 +20821,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20935,8 +20843,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21152,6 +21060,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21197,11 +21109,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21213,15 +21125,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21269,7 +21181,7 @@ msgstr "" msgid "short description" msgstr "" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21288,15 +21200,15 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21312,31 +21224,31 @@ msgstr "" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21344,15 +21256,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21365,7 +21277,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21376,7 +21288,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21385,14 +21297,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21404,20 +21316,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21449,7 +21361,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21457,31 +21369,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21495,7 +21407,7 @@ msgstr "" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21507,11 +21419,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21520,7 +21432,7 @@ msgstr "" msgid "type here to search" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21568,11 +21480,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21598,8 +21511,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21624,6 +21537,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21681,61 +21598,69 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21766,15 +21691,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21783,7 +21706,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21796,11 +21719,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/cs/LC_MESSAGES/frontend.po b/ui/locale/cs/LC_MESSAGES/frontend.po index fd645eb0bed..c57f521d95a 100644 --- a/ui/locale/cs/LC_MESSAGES/frontend.po +++ b/ui/locale/cs/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2018-09-24 07:57+0300\n" "Last-Translator: Lukáš <iam@lukasmaly.net>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -520,7 +520,7 @@ msgstr "Přijmout" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Přijato" @@ -619,7 +619,7 @@ msgstr "Akce \"%1$s\" již existuje." msgid "Action \"%1$s\" no operations defined." msgstr "Pro akci \"%1$s\" není definována operace." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -747,7 +747,7 @@ msgstr "Aktivní do" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -758,7 +758,7 @@ msgstr "Aktivní do" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -1014,7 +1014,7 @@ msgstr "Stáří méně než" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1340,7 +1340,7 @@ msgstr "V (hodina:minuta)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1349,8 +1349,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1361,6 +1361,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "Minimálně jedna skupina hostů musí být vybrána." +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1372,7 +1377,7 @@ msgstr "Minimálně jedna perioda údržby musí být vytvořena." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1458,7 +1463,7 @@ msgstr "Autentizace" msgid "Authentication algorithm" msgstr "Autentizační algoritmus" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "Ověření selhalo: %1$s." @@ -1507,7 +1512,7 @@ msgstr "Auto" msgid "Auto-login" msgstr "Automatické přihlášení" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Možnosti automatického přihlášení a automatického odhlášení nelze provozovat simultánně." @@ -1518,7 +1523,7 @@ msgstr "Automatické odhlášení" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1777,7 +1782,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1812,7 +1817,7 @@ msgstr "Odvolat" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -2019,7 +2024,7 @@ msgstr "Není možné navázat na LDAP server." msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2145,7 +2150,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Není možné smazat interního Zabbix uživatele \"%1$s\", zkuste ho vypnout." @@ -2154,7 +2159,7 @@ msgstr "Není možné smazat interního Zabbix uživatele \"%1$s\", zkuste ho vy msgid "Cannot delete action" msgstr "Nelze smazat akci" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2227,7 +2232,7 @@ msgstr[0] "Nelze odstranit hosta, protože údržba \"%1$s\" musí obsahovat min msgstr[1] "Nelze odstranit vybrané hosty, protože údržba \"%1$s\" musí obsahovat minimálně jednoho hosta nebo skupinu hostů." msgstr[2] "Nelze odstranit vybrané hosty, protože údržba \"%1$s\" musí obsahovat minimálně jednoho hosta nebo skupinu hostů." -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2302,7 +2307,7 @@ msgstr[0] "Nelze smazat proxy" msgstr[1] "Nelze smazat proxy" msgstr[2] "Nelze smazat proxy" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2328,7 +2333,7 @@ msgstr[0] "Nelze smazat skript" msgstr[1] "Nelze smazat skript" msgstr[2] "Nelze smazat skript" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Není možné smazat skripty. Skript \"%1$s\" se používá v operaci akce \"%2$s\"." @@ -2748,16 +2753,16 @@ msgstr "Nelze nalézt mapu hodnot \"%1$s\" použitou pro prototyp položky \"%2$ msgid "Cannot have empty visible template name." msgstr "Není možné mít prázdné zobrazované jméno šablony." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2771,7 +2776,7 @@ msgstr[0] "Není možné importovat šablonu \"%1$s\", připojená šablona \"%2 msgstr[1] "Není možné importovat šablonu \"%1$s\", připojené šablony \"%2$s\" neexistují." msgstr[2] "Není možné importovat šablonu \"%1$s\", připojené šablony \"%2$s\" neexistují." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Není možné vložit výraz spouštěče" @@ -2793,7 +2798,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2855,7 +2860,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Není možné číst odpověď, zkontrolujte spojení se Zabbix serverem \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Není možné přejmenovat uživatele guest." @@ -2939,7 +2944,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Není možné zrušit a smazat web scénář." @@ -2952,7 +2957,7 @@ msgstr "Nelze odpojit šablonu" msgid "Cannot unlink template." msgstr "Není možné zrušit linkování šablony." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -3014,9 +3019,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Není možné aktualizovat objevený graf." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Není možné aktualizovat objevenou skupinu hostů." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3076,9 +3082,7 @@ msgstr "Není možné aktualizovat prototyp grafu" msgid "Cannot update group" msgstr "Nelze upravit skupinu" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Není možné aktualizovat skupiny pro objeveného hosta \"%1$s\"." @@ -3163,12 +3167,12 @@ msgstr "Nelze upravit síťovou mapu" msgid "Cannot update proxy" msgstr "Nelze upravit proxy" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Není možné aktualizovat proxy pro objeveného hosta \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3188,9 +3192,9 @@ msgstr "" msgid "Cannot update script" msgstr "Nelze upravit skript" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3375,8 +3379,8 @@ msgid "Character string not included" msgstr "Neobsahuje řetězec" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3552,7 +3556,7 @@ msgstr "Hodiny" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3590,13 +3594,13 @@ msgstr "Zavřít" msgid "Close expression constructor" msgstr "Zavřít kunstruktéra výrazu" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Zavřít novou událost" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Zavřít starou událost" @@ -3693,7 +3697,7 @@ msgstr "Komprimace" msgid "Concurrent sessions" msgstr "Souběžné relace" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3704,11 +3708,6 @@ msgstr "Podmínka" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "Podmínka \"%2$s\" není použitá ve formuli \"%3$s\" pro akci \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "Podmínka \"%2$s\" se nepoužívá ve vzorci \"%3$s\" pro korelaci \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3724,11 +3723,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "Podmínka \"%2$s\" použitá ve formuli \"%3$s\" pro akci \"%1$s\" není definovaná." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "Podmínka \"%2$s\" použitá ve vzorci \"%3$s\" pro korelaci \"%1$s\" není definována." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3920,7 +3914,7 @@ msgstr "Potvrzující text" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Gratulace! Právě jste úspěšně nainstalovali Zabbix frontend." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4122,12 +4116,11 @@ msgstr "Kopírovat" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Korelace" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "Korelace \"%1$s\" již existuje." @@ -4158,16 +4151,6 @@ msgstr[0] "Korelace povolena" msgstr[1] "Korelace povoleny" msgstr[2] "Korelace povoleny" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "Korelaci chybí parametry: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "Název korelace nemůže být prázdný." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Korelační pravidlo" @@ -4178,8 +4161,8 @@ msgstr "Korelace aktualizována" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Počet" @@ -4551,7 +4534,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "Jméno DNS" @@ -4827,8 +4810,8 @@ msgstr "Pro" msgid "December" msgstr "Prosinec" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4838,7 +4821,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4935,7 +4918,7 @@ msgstr "Zpožděno o" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4985,7 +4968,7 @@ msgstr "Smazat a vyčistit šablonu? (Pozor: všechny připojené hosty budou ta msgid "Delete current action?" msgstr "Smazat aktuální akci?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Smazat aktuální korelaci?" @@ -5283,7 +5266,7 @@ msgstr "" msgid "Dependencies" msgstr "Závislosti" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Závisející" @@ -5291,7 +5274,7 @@ msgstr "Závisející" msgid "Dependent item" msgstr "Závislá položka" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5500,10 +5483,10 @@ msgstr "Zakázat označené scénáře?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5586,7 +5569,7 @@ msgid "Discovery by proxy" msgstr "Průzkum podle proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Kontrola průzkumu" @@ -5598,7 +5581,7 @@ msgstr "Kontroly objevování" msgid "Discovery list" msgstr "Objevovací seznam" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Objekt objevování" @@ -5701,7 +5684,7 @@ msgstr "Pravidlo nálezu aktualizováno" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5712,7 +5695,7 @@ msgstr "Pravidla nálezu" msgid "Discovery rules deleted" msgstr "Pravidla nálezu byla smazána" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Stav nálezu" @@ -5868,18 +5851,6 @@ msgstr "Návrh" msgid "Draw style" msgstr "Styl vykreslení" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "Duplicita \"%1$s\" hodnoty \"%2$s\" pro korelaci \"%3$s\"." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Duplicate \"%1$s\" hodnoty \"%2$s\" pro korelaci." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5892,11 +5863,6 @@ msgstr "Duplicitní \"name\" hodnota \"%1$s\" pro mapu." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -6056,10 +6022,6 @@ msgstr "Prázdný soubor SSL klíče pro web scénář \"%1$s\"." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "Prázdné ID korelace." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6086,11 +6048,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "Podmíněný typ akce pro prázdný filtr \"%1$s\"." #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6275,7 +6235,7 @@ msgstr "Zapnout pasti" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6286,7 +6246,7 @@ msgstr "Zapnout pasti" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6329,7 +6289,7 @@ msgid "English (en_US)" msgstr "Anglicky (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6404,7 +6364,7 @@ msgid "Event correlation" msgstr "Korelace událostí" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Pravidla korelace události" @@ -6439,11 +6399,11 @@ msgstr "Monitoring logu událostí. Vráti log" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Pár značky události" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Typ události" @@ -6780,7 +6740,6 @@ msgstr "Pole \"%1$s\" nemůže být nastavené na NULL." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7148,7 +7107,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Zadaný výraz není makro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "Globální regulární výraz \"%1$s\" neexistuje." @@ -7394,12 +7353,12 @@ msgstr "Mřížka" msgid "Group" msgstr "Skupina" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Skupina \"%1$s\" nemůže být smazána, protože je používána prototypem hosta." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "Skupina \"%1$s\" nemůže být odstraněna, protože je použita v korelační podmínce." @@ -7733,7 +7692,7 @@ msgstr[2] "Hostitelé" msgid "Host \"%1$s\" already exists." msgstr "Host \"%1$s\" již existuje." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7741,7 +7700,7 @@ msgstr "Host \"%1$s\" již existuje." msgid "Host \"%1$s\" cannot be without host group." msgstr "Host \"%1$s\" nemůže být bez hostitelské skupiny." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7814,17 +7773,17 @@ msgstr[2] "Hosty povoleny" msgid "Host group" msgstr "Skupina hostitele" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Skupina hostů \"%1$s\" již existuje." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Skupinu hostů \"%1$s\" není možné smazat, je použitá v globálním skriptu." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7838,9 +7797,9 @@ msgid "Host group label type" msgstr "Typ popisku skupiny" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "Skupina hostů s ID \"%1$s\" není dostupná." @@ -7856,8 +7815,8 @@ msgstr "Skupina hostů s ID \"%1$s\" není dostupná." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -8045,7 +8004,7 @@ msgstr "Host se stejným viditelným jménem \"%1$s\" již existuje." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8133,7 +8092,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP adresa" @@ -8158,7 +8117,7 @@ msgstr "IP rozsah \"%1$s\" přesahuje \"%2$s\" limit adresy" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8215,12 +8174,12 @@ msgstr "Zvýraznění ikony" msgid "Icon map" msgstr "Mapová ikona" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Mapová ikona \"%1$s\" nemůže byt smazaná. Je použita v mapě \"%2$s\"." @@ -8244,7 +8203,7 @@ msgstr "Mapová ikona byla aktualizována" msgid "Icon mapping" msgstr "Mapování ikon" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "Ikona s ID \"%1$s\" není dostupná." @@ -8477,7 +8436,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8490,11 +8449,11 @@ msgstr "Nepřístupná mapa" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "Nedostupná šablona" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "Nedostupný spouštěč" @@ -8706,24 +8665,6 @@ msgstr "Neplatná operace skupiny. Skupina neexistuje nebo k ní nemáte příst msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Neplatná operace uživatele. Uživatel neexistuje nebo k němu nemáte přístup." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8808,20 +8749,11 @@ msgstr "Nesprávné podmínky pro akci \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Nesprávné podmínky pro pravidlo nálezu \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "Nesprávná korelace ID." - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "Nesprávně nastavený výraz \"%2$s\" pro akci \"%1$s\": %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "Nesprávně nastavený výraz \"%2$s\" pro korelaci \"%1$s\": %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8886,11 +8818,6 @@ msgstr "Nesprávná podmínka filtru ID pro akci \"%1$s\"." msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Nesprávná podmínka filtru ID pro pravidlo nálezu \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "Nesprávný filtr korelace ID je uveden pro korelaci \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8998,7 +8925,7 @@ msgstr "Neplatné ID mapy." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Neplatná metoda \"%1$s.%2$s\"." @@ -9112,11 +9039,6 @@ msgstr "Neplatný výraz prototypu spouštěče. Elementy výrazu prototypu spou msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Neplatný typ kalkulace pro akci \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "Neplatný typ výpočtu pro korelaci \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9138,10 +9060,10 @@ msgstr "Neplatné user ID specifikované pro mapu \"%1$s\"." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "Neplatná uživatelská skupina ID specifikovaná pro mapu \"%1$s\"." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9203,18 +9125,6 @@ msgstr "Neplatná hodnota \"%1$s\" pro integer field \"%2$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Neplatná hodnota \"%1$s\" pro unsigned integer field \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "Neplatná hodnota \"%1$s\" v poli \"%2$s\" pro korelaci \"%3$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9276,12 +9186,6 @@ msgstr "Nesprávná hodnota pro pole \"%1$s\"." #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9393,7 +9297,7 @@ msgstr "Nesprávná hodnota pro pole \"%1$s\"." #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9404,9 +9308,9 @@ msgstr "Nesprávná hodnota pro pole \"%1$s\"." #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9557,7 +9461,7 @@ msgstr "Zděděné a spuštěné značky" msgid "Inherited items" msgstr "Zděděné položky" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Vložit" @@ -9685,7 +9589,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Interval" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9708,7 +9612,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "Neplatná akce: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9722,7 +9626,7 @@ msgstr "Neplatné datum." msgid "Invalid email address \"%1$s\"." msgstr "Neplatná emailová adresa \"%1$s\"." -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "Neplatná emailová adresa pro typ médií s ID \"%1$s\"." @@ -9769,9 +9673,11 @@ msgstr "Neplatné parametry metody." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9811,17 +9717,17 @@ msgstr "Neplatné parametry metody." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9829,14 +9735,14 @@ msgstr "Neplatné parametry metody." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9844,111 +9750,116 @@ msgstr "Neplatné parametry metody." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10162,7 +10073,7 @@ msgstr[2] "Položky povolené" msgid "Item in \"not supported\" state" msgstr "Položka je v \"not supported\" stavu" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Položka nevybraná" @@ -10342,7 +10253,7 @@ msgstr "Položky byly aktualizovány" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10535,7 +10446,7 @@ msgstr "Umístění popisku" msgid "Language" msgstr "Jazyk" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11142,7 +11053,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11385,7 +11296,7 @@ msgstr[0] "Maximální časová perioda na zobrazení je %1$s den." msgstr[1] "Maximální časová perioda na zobrazení je %1$s dní." msgstr[2] "Maximální časová perioda na zobrazení je %1$s dní." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "Překročena maximální celková délka emailové adresy pro typ médií s ID \"%1$s\"." @@ -11410,7 +11321,7 @@ msgstr "Média" msgid "Media type" msgstr "Typ média" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Media type \"%1$s\" již existuje." @@ -11457,7 +11368,7 @@ msgstr "Test typu média byl úspěšný." msgid "Media type updated" msgstr "Typ média byl aktualizován" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "Typ media s ID \"%1$s\" není dostupný." @@ -11469,7 +11380,7 @@ msgstr "Typ media s ID \"%1$s\" není dostupný." msgid "Media types" msgstr "Typy médií" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11721,7 +11632,7 @@ msgstr[2] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12123,15 +12034,17 @@ msgstr "Nový dashboard" msgid "New element" msgstr "Nový prvek" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "Nová událost host skupiny" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Nová značka hodnoty události" @@ -12151,7 +12064,7 @@ msgstr "" msgid "New service time" msgstr "Nový servisní čas" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12178,7 +12091,7 @@ msgstr "Další krok" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12207,30 +12120,6 @@ msgstr "Další krok" msgid "No" msgstr "Ne" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "Ne \"%1$s\" vzhledem ke korelaci \"%2$s\"." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "Ne \"%1$s\" vzhledem ke korelaci." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12280,11 +12169,6 @@ msgstr "Není specifikované uživatelské jméno autentizace." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "Žádný typ podmínky vzhledem ke korelaci \"%1$s\"." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12423,17 +12307,46 @@ msgstr "Žádné výběry nenalezené" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "Žádný typ operace vzhledem ke korelaci \"%1$s\"." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Žádné oprávnění pro přístup do systému." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12469,10 +12382,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12500,13 +12412,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12526,8 +12443,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12550,24 +12467,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12589,16 +12506,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12654,7 +12571,7 @@ msgstr "Žádné definované spouštěče." msgid "No value" msgstr "Žádná hodnota" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Non-boolean flags jsou zastaralé." @@ -12724,15 +12641,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Není povolené nastavení hesla pro uživatele \"guest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -13066,15 +12983,16 @@ msgstr "Vypnuté" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Stará hodnota značky události" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -13096,10 +13014,6 @@ msgstr "Jednou" msgid "One" msgstr "Jedna" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Jeden z objektů je bez skupiny hostů." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Pouze jednou" @@ -13109,10 +13023,6 @@ msgstr "Pouze jednou" msgid "One-time downtime" msgstr "Jednorázový downtime" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Jen super administrátoři mohou vytvořit skupiny." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Jen kontroly typu Zabbix agent, SNMPv1, SNMPv2 nebo SNMPv3 mohou být unikátní." @@ -13162,10 +13072,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Pouze super administrátoři mohou vytvářet korelace." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "Pouze super administrátoři mohou ustanovit vlastníka dashboardu." @@ -13174,10 +13080,6 @@ msgstr "Pouze super administrátoři mohou ustanovit vlastníka dashboardu." msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Pouze super administrátoři mohou aktualizovat korelace." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Počítány jsou pouze spouštěče přiřazené k povoleným hostitelům a závisející na povolených položkách" @@ -13226,7 +13128,7 @@ msgstr "Operace nemá šablonu na vykonání." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13235,33 +13137,33 @@ msgstr "" msgid "Operations" msgstr "Operace" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operátor" @@ -13670,16 +13572,16 @@ msgstr "" msgid "Parameter" msgstr "Parametr" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Parametr \"%1$s\" je zastaralý." @@ -13816,7 +13718,7 @@ msgstr "" msgid "Paste without external links" msgstr "Vlož bez externích odkazů" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13862,7 +13764,7 @@ msgstr "Vykonat DNS dotaz. Vrátí řetězec s požadovaným typem informace" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13995,7 +13897,7 @@ msgstr "Vyplň pole host inventáře" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14315,7 +14217,7 @@ msgstr "Proxy" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14323,7 +14225,7 @@ msgstr "Proxy" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14333,12 +14235,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Proxy \"%1$s\" pro host \"%2$s\" neexistuje." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "Proxy \"%1$s\" je používána akcí \"%2$s\"." -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Proxy \"%1$s\" je použitá pravidlem nálezu \"%2$s\"." @@ -14614,7 +14516,7 @@ msgstr "Normální" msgid "Regular expression" msgstr "Regulární výraz" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14875,7 +14777,7 @@ msgid "Replace dependencies" msgstr "Nahradit závislosti" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -15072,7 +14974,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Výsledek" @@ -15313,7 +15215,7 @@ msgstr "SMTP port serveru" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15614,7 +15516,7 @@ msgstr "Rozsah" msgid "Script" msgstr "Skript" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Skript \"%1$s\" již existuje." @@ -15729,7 +15631,7 @@ msgid "Security name" msgstr "Bezpečnostní jméno" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15945,11 +15847,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Čas startu služby musí být menší než její konec." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15961,7 +15863,7 @@ msgstr "" msgid "Service times" msgstr "Servisní časy" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Typ služby" @@ -15974,7 +15876,7 @@ msgstr "" msgid "Service updated" msgstr "Služba byla aktualizována" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15986,7 +15888,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -16004,9 +15906,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Sezení ukončené, prosím přihlaste se znovu." @@ -16068,7 +15970,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16913,10 +16815,10 @@ msgstr "Tabulka \"%1$s\" neobsahuje pole se jménem \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Označení" @@ -17053,7 +16955,7 @@ msgstr "Šablona" msgid "Template \"%1$s\" already exists." msgstr "Šablona \"%1$s\" již existuje." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17137,7 +17039,7 @@ msgstr "Šablona se stejným viditelným jménem \"%1$s\" již existuje." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17436,7 +17338,7 @@ msgstr "Do" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17847,7 +17749,7 @@ msgstr "Spouštěč byl aktualizován" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17911,9 +17813,9 @@ msgstr "Dva prvky mapy by měly být vybrány" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17923,7 +17825,7 @@ msgstr "Dva prvky mapy by měly být vybrány" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17975,7 +17877,7 @@ msgstr "Typ informace" msgid "Types" msgstr "Typy" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -18046,8 +17948,8 @@ msgstr "URL musí mít \"jméno\" a \"url\" v mapě \"%1$s\"." msgid "URLs" msgstr "URL" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18157,21 +18059,23 @@ msgstr "Jednotky" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Neznámý" @@ -18189,7 +18093,7 @@ msgid "Unknown error" msgstr "Neznáma chyba" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Zadaná položka ve vybraném hostiteli neexistuje" @@ -18329,7 +18233,7 @@ msgstr "Dostupný" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18463,37 +18367,37 @@ msgstr "Používané v akcích" msgid "User" msgstr "Uživatel" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "User \"%1$s\" nemůže být bez skupiny uživatelů." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "Uživatel \"%1$s\" je majitel obrazovky \"%2$s\"." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "Uživatel \"%1$s\" je vlastníkem mapy \"%2$s\"." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "Uživatel \"%1$s\" je použit v akci \"%2$s\"." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18515,13 +18419,13 @@ msgstr "Uživatel byl přidán" msgid "User agent string" msgstr "Uživatelský řetězec agenta" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Uživatel nemůže sám sebe přidat do vypnuté skupiny nebo do skupiny s vypnutým GUI přístupem." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18546,27 +18450,27 @@ msgstr[2] "" msgid "User group" msgstr "Skupina uživatelů" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Uživatelská skupina \"%1$s\" již existuje." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "Skupina uživatelů \"%1$s\" je použita v akci \"%2$s\"." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Skupina \"%1$s\" je použitá v nastavení skupiny pro správu o nefunkční databáze." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Uživatelská skupina \"%1$s\" je použitá v skriptu \"%2$s\"." @@ -18602,9 +18506,9 @@ msgstr[2] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "Skupina uživatelů ID \"%1$s\" není dostupná." @@ -18619,7 +18523,7 @@ msgstr "Skupina uživatelů ID \"%1$s\" není dostupná." msgid "User groups" msgstr "Skupiny uživatelů" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Uživatel nemá dovolené smazat sám sebe." @@ -18654,7 +18558,7 @@ msgstr "Profil uživatele" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18674,7 +18578,7 @@ msgstr[2] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18725,12 +18629,12 @@ msgstr "Uživatel byl aktualizován" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "Uživatel s ID \"%1$s\" není dostupný." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -19041,14 +18945,14 @@ msgstr "Validace" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19160,11 +19064,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Hodnota Windows čítače výkonu. Vráti celé, desetinné číslo, řetězec nebo text (závisí na dotazu)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19703,7 +19608,7 @@ msgstr "Ročně" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19760,7 +19665,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19893,11 +19797,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "boolean je očekávám" @@ -19905,16 +19809,16 @@ msgstr "boolean je očekávám" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "řetězec znaků se očekává" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19923,37 +19827,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "je očekáván nález makra na nízké úrovni" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "číslo je očekáváno" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "číslo je moc veliké" @@ -19974,7 +19878,7 @@ msgstr "je očekáván relativní čas" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19982,19 +19886,19 @@ msgstr "" msgid "a time is expected" msgstr "očekáváný čas" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "je očekávána perioda času" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: include/validate.inc.php:221 msgid "a time range is expected" msgstr "očekává se časový rozsah" #: app/controllers/CControllerPopupHttpStep.php:94 #: app/controllers/CControllerPopupLldOperation.php:154 -#: include/classes/validators/CApiInputValidator.php:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -20044,7 +19948,7 @@ msgstr "vše" msgid "all media" msgstr "všechny média" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -20066,23 +19970,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "očekává se pole" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "řada či znakový řetězec je očekáván" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -20092,7 +19996,7 @@ msgid "an empty string is expected" msgstr "prázdný řetězec je očekávan" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "je očekáván sudý počet hexadecimálních znaků" @@ -20100,11 +20004,15 @@ msgstr "je očekáván sudý počet hexadecimálních znaků" msgid "an explicit time is expected" msgstr "přesný čas je očekáván" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20265,13 +20173,7 @@ msgstr "nemůže být změněno" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20302,13 +20204,13 @@ msgstr "nemůže být změněno" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20326,14 +20228,14 @@ msgstr "nemůže být změněno" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20406,7 +20308,8 @@ msgid "configure" msgstr "konfigurace" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "obsahuje" @@ -20497,7 +20400,7 @@ msgstr "klesající" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20519,13 +20422,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "neobsahuje" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "nerovná se" @@ -20551,7 +20454,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20588,7 +20492,7 @@ msgstr "výraz je prázdný" msgid "failed to parse JSON" msgstr "chyba v analýze JSON" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20679,7 +20583,7 @@ msgstr "ikonka" msgid "image" msgstr "obrázek" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20724,15 +20628,19 @@ msgstr "neplatný počet prvků" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "nesprávná syntaxe u \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20760,7 +20668,7 @@ msgstr "Neplatný vzorec Prometheus " msgid "invalid address range \"%1$s\"" msgstr "neplatný rozsah adresy \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "neplatná bytová sekvence v UTF-8" @@ -20789,27 +20697,27 @@ msgstr "" msgid "invalid history storage period" msgstr "neplatná perioda historie ukládání" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "neplatný název skupiny" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "neplatné jméno hosta" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "neplatný regulérní výraz" @@ -20837,7 +20745,7 @@ msgstr "je větší než nebo se rovná" msgid "is less than or equals" msgstr "je menší než nebo se rovná" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "není to uzavřeno v {} nebo je to poškozeno" @@ -20987,7 +20895,7 @@ msgstr "shody" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -21027,7 +20935,7 @@ msgid "min() - Minimum value for period T" msgstr "min() - Minimální hodnota pro periodu T" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "minimální délka je %1$s znaků" @@ -21054,8 +20962,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -21076,8 +20984,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "musí obsahovat minimálně jedno základní vyhledávací makro" @@ -21293,6 +21201,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21338,11 +21250,11 @@ msgstr "" msgid "regular expression" msgstr "regulární výraz" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21354,15 +21266,15 @@ msgstr "" msgid "right" msgstr "pravý" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21410,7 +21322,7 @@ msgstr "" msgid "short description" msgstr "krátký popis" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21429,15 +21341,15 @@ msgstr "krátký popis" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "by měla být prázdná" @@ -21453,31 +21365,31 @@ msgstr "zobrazit mapování ikon" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21485,15 +21397,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "sum() - Souhrn hodnot za periodu T" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "zadaná pověření nejsou jedinečná" @@ -21506,7 +21418,7 @@ msgstr "zadaná pověření nejsou jedinečná" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21517,7 +21429,7 @@ msgstr "zadaná pověření nejsou jedinečná" msgid "tag" msgstr "značka" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21526,14 +21438,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "šablona ID \"%1$s\" je použitá %2$s krát" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21545,20 +21457,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "parametr \"%1$s\" chybí" @@ -21590,7 +21502,7 @@ msgstr "třetí" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21598,31 +21510,31 @@ msgstr "" msgid "time shift" msgstr "časový posun" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "time() - Aktuální čas" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft() - Odhad čas pro dosažení limitu je založen na periodě T" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21636,7 +21548,7 @@ msgstr "spouštěč" msgid "trigger does not allow manual closing" msgstr "spouštěč neumožňuje manuální zavírání" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21648,11 +21560,11 @@ msgstr "prototyp spouštěče nelze přesunout do jiné šablony nebo hosta" msgid "trigger with linkages cannot be moved to another template or host" msgstr "spouštěc s vazbami nelze přesunout do jiné šablony nebo hosta" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21661,7 +21573,7 @@ msgstr "" msgid "type here to search" msgstr "pište zde pro vyhledávání" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21709,11 +21621,12 @@ msgstr "neočekávaný konec makra" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "neočekávaný parametr \"%1$s\"" @@ -21739,8 +21652,8 @@ msgstr "neočekávaný text \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21765,6 +21678,10 @@ msgstr "nepodporovaná časová přípona" msgid "unsupported version number" msgstr "nepodporované číslo verze" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21822,61 +21739,71 @@ msgstr "hodnota \"%1$s\" nebyla nalezena" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "hodnota %1$s již existuje" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "hodnota je příliš dlouhá" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21907,15 +21834,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "hodnota musí být jedna z %1$s" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21924,7 +21849,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21937,11 +21862,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/de/LC_MESSAGES/frontend.po b/ui/locale/de/LC_MESSAGES/frontend.po index 660cb9cb492..908b7f262fa 100644 --- a/ui/locale/de/LC_MESSAGES/frontend.po +++ b/ui/locale/de/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2021-10-01 11:19+0300\n" "Last-Translator: Joachim <joachim.schwender@web.de>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -500,7 +500,7 @@ msgstr "Bestätigen" msgid "Acknowledge problems" msgstr "Probleme bestätigen" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Bestätigt" @@ -600,7 +600,7 @@ msgstr "Aktion \"%1$s\" existiert bereits." msgid "Action \"%1$s\" no operations defined." msgstr "Aktion \"%1$s\" hat keine Operationen definiert." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "Aktion \"%2$s\" ist für die Benutzerrolle \"%1$s\" nicht verfügbar." @@ -726,7 +726,7 @@ msgstr "Aktiv bis" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -737,7 +737,7 @@ msgstr "Aktiv bis" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -993,7 +993,7 @@ msgstr "Jünger als" msgid "Age less than %1$s" msgstr "Jünger als %1$s" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1319,7 +1319,7 @@ msgstr "Um (Stunde:Minute)" msgid "At least one UI element must be checked." msgstr "Mindestens ein UI Element muss ausgewählt sein." -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "Mindestens ein UI-Element muss für die Benutzerrolle \"%1$s\" aktiviert sein." @@ -1328,8 +1328,8 @@ msgstr "Mindestens ein UI-Element muss für die Benutzerrolle \"%1$s\" aktiviert msgid "At least one action is mandatory." msgstr "Mindestens eine Aktion ist Pflicht." -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "At least one UI element must be enabled for the \"%1$s\" user role." @@ -1340,6 +1340,11 @@ msgstr "At least one UI element must be enabled for the \"%1$s\" user role." msgid "At least one host group or host must be selected." msgstr "Mindestens eine Host-Gruppe oder ein Host muss ausgewählt sein." +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1351,7 +1356,7 @@ msgstr "Zumindest ein Wartungsfenster muss erstellt werden." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "Mindestens eine der Datenbanken MySQL, PostgreSQL oder Oracle sollte unterstützt sein." -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "Mindestens eine Operation muss ausgewählt sein." @@ -1437,7 +1442,7 @@ msgstr "Authentifizierung" msgid "Authentication algorithm" msgstr "Authentifizierungs-Algorithmus" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "Authentifizierung fehlgeschlagen: %1$s." @@ -1486,7 +1491,7 @@ msgstr "Automatisch" msgid "Auto-login" msgstr "Automatisches Anmelden" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Automatisches An-und Abmelden kann nicht gleichzeitig aktiviert werden." @@ -1497,7 +1502,7 @@ msgstr "Automatisches Abmelden" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1757,7 +1762,7 @@ msgstr "CRLF" msgid "CSV to JSON" msgstr "CSV nach JSON" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "CUID erwartet" @@ -1792,7 +1797,7 @@ msgstr "Rückruf" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1998,7 +2003,7 @@ msgstr "Kann nicht an LDAP Server anbinden." msgid "Cannot build expression tree: %1$s." msgstr "Ausdrucksbaum kann nicht erstellt werden: %1$s." -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "Der Benutzertyp der eigenen Rolle kann nicht geändert werden." @@ -2121,7 +2126,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "API-Token kann nicht gelöscht werden" msgstr[1] "API-Token können nicht gelöscht werden" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Kann Zabbix-internen Benutzer \"%1$s\" nicht löschen. Alternativ könnte er deaktiviert werden." @@ -2130,7 +2135,7 @@ msgstr "Kann Zabbix-internen Benutzer \"%1$s\" nicht löschen. Alternativ könnt msgid "Cannot delete action" msgstr "Kann Aktion nicht löschen" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "Die zugewiesene Benutzerrolle \"%1$s\" kann nicht gelöscht werden." @@ -2196,7 +2201,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "Kann den Host nicht löschen da die Wartung \"%1$s\" mindestens einen Host oder Host-Gruppe enthalten muss." msgstr[1] "Kann die ausgewählten Hosts nicht löschen da die Wartung \"%1$s\" mindestens einen Host oder Host-Gruppe enthalten muss." -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2267,7 +2272,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "Kann Proxy nicht löschen" msgstr[1] "Kann Proxy nicht löschen" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "Schreibgeschützte Benutzerrolle \"%1$s\" kann nicht gelöscht werden." @@ -2290,7 +2295,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "Kann Skript nicht löschen" msgstr[1] "Kann Skript nicht löschen" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Kann Skript nicht löschen. Aktionsoperation \"%2$s\" verwendet Skript \"%1$s\"." @@ -2683,16 +2688,16 @@ msgstr "Keine Wertezuordnung \"%1$s\" gefunden, für Datenpunktvorlage \"%2$s\" msgid "Cannot have empty visible template name." msgstr "Kann keinen leeren Anzeigenamen haben." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "Nicht standardmäßige Regel \"%2$s\" kann nicht verwendet werden, wenn \"%3$s\" für die Benutzerrolle \"%1$s\" auf %4$d gesetzt ist." -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "Es kann kein nicht leerer Tag-Wert vorhanden sein, während ein leeres Tag in der Regel \"%2$s\" für die Benutzerrolle \"%1$s\" vorhanden ist." @@ -2705,7 +2710,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "Kann Vorlage nicht importieren \"%1$s\", verknüpfte Vorlage \"%2$s\" existiert nicht." msgstr[1] "Kann Vorlage nicht importieren \"%1$s\", verknüpfte Vorlagen \"%2$s\" existieren nicht." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Kann Auslöser Ausdruck nicht einfügen" @@ -2726,7 +2731,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "Modul kann nicht geladen werden bei: %1$s." msgstr[1] "Module können nicht geladen werden bei: %1$s." -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "Abmeldung nicht möglich." @@ -2788,7 +2793,7 @@ msgstr "YAML kann nicht gelesen werden: %1$s." msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Kann Antwort nicht lesen. Überprüfen Sie die Verbindungen mit dem Zabbix-Server \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Gastbenutzer kann nicht umbenannt werden." @@ -2871,7 +2876,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "Kann Benutzer nicht entsperren" msgstr[1] "Kann Benutzer nicht entsperren" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Kann Web-Szenarien nicht trennen und leeren." @@ -2884,7 +2889,7 @@ msgstr "Kann Vorlage nicht trennen" msgid "Cannot unlink template." msgstr "Kann Vorlage nicht trennen." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "Der Auslöser \"%1$s\" kann nicht entkoppelt werden, da er Elemente aus der Vorlage enthält, die noch mit dem Host verknüpft ist." @@ -2946,9 +2951,10 @@ msgstr "API-Token kann nicht aktualisiert werden" msgid "Cannot update a discovered graph." msgstr "Per Suchlauf entdecktes Diagramm nicht aktualisierbar." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Kann per Suchlauf entdeckte Host-Gruppe nicht aktualisieren." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3007,9 +3013,7 @@ msgstr "Kann Diagramm-Prototyp nicht aktualisieren" msgid "Cannot update group" msgstr "Kann Gruppe nicht ändern" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Kann Gruppen für per Suchlauf entdeckten Host \"%1$s\" nicht aktualisieren." @@ -3092,12 +3096,12 @@ msgstr "Kann Karte nicht ändern" msgid "Cannot update proxy" msgstr "Kann Proxy nicht ändern" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Proxy für per Suchlauf enddeckten Host \"%1$s\" kann nicht aktualisiert werden." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "Die schreibgeschützte Benutzerrolle \"%1$s\" kann nicht aktualisiert werden." @@ -3117,9 +3121,9 @@ msgstr "Geplanter Bericht kann nicht aktualisiert werden" msgid "Cannot update script" msgstr "Kann Skript nicht ändern" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "Skriptbereich kann nicht aktualisiert werden. Skript \"%1$s\" wird in Aktion \"%2$s\" verwendet." @@ -3302,8 +3306,8 @@ msgid "Character string not included" msgstr "Zeichenfolge nicht enthalten" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "Zeichen" @@ -3479,7 +3483,7 @@ msgstr "Uhr" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3517,13 +3521,13 @@ msgstr "Schließen" msgid "Close expression constructor" msgstr "Ausdrucksgenerator schließen" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Schließe neues Ereignis" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Schließe alte Ereignisse" @@ -3620,7 +3624,7 @@ msgstr "Kompression" msgid "Concurrent sessions" msgstr "Aktuelle Sitzungen" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3631,11 +3635,6 @@ msgstr "Voraussetzung" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "Zustand \"%2$s\" in der Formel \"%3$s\" für Aktion \"%1$s\" ungenutzt." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "Zustand \"%2$s\" in der Formel \"%3$s\" für Korrelation \"%1$s\" ungenutzt." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3651,11 +3650,6 @@ msgstr "Zustand \"%2$s\" in der Formel \"%3$s\" für Vorrangregel \"%1$s\" ungen msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "Zustand \"%2$s\" in der Formel \"%3$s\" für Aktion \"%1$s\" undefiniert." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "Zustand \"%2$s\" verwendet in Formel \"%3$s\" für Korrelation \"%1$s\" ist nicht definiert." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3847,7 +3841,7 @@ msgstr "Bestätigungstext" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Herzlichen Glückwunsch! Sie haben das Zabbix Frontend erfolgreich installiert." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4060,12 +4054,11 @@ msgstr "Kopieren" msgid "Copy to clipboard" msgstr "In Zwischenablage kopieren" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Korrelation" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "Korrelation \"%1$s\" ist bereits vorhanden." @@ -4092,16 +4085,6 @@ msgid_plural "Correlations enabled" msgstr[0] "Korrelation aktiviert" msgstr[1] "Korrelationen aktiviert" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "Fehlende Parameter in Korrelation: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "Korrelationsname darf nicht leer sein." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Korrelationsregel" @@ -4113,8 +4096,8 @@ msgstr "Korrelation aktualisiert" # Zähler? #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Gesamt" @@ -4488,7 +4471,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS-Name" @@ -4764,8 +4747,8 @@ msgstr "Dez" msgid "December" msgstr "Dezember" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "Dezimalstellen" @@ -4775,7 +4758,7 @@ msgstr "Verringern um" #: 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:232 +#: include/hosts.inc.php:1245 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 @@ -4872,7 +4855,7 @@ msgstr "Verspätung" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4922,7 +4905,7 @@ msgstr "Vorlage löschen und leeren? (Achtung: Alle verbundenen Hosts werden gel msgid "Delete current action?" msgstr "Aktuelle Aktion löschen?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Aktuelle Korrelation löschen?" @@ -5220,7 +5203,7 @@ msgstr "Ablehnungsliste" msgid "Dependencies" msgstr "Abhängigkeiten" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "ABHÄNGIGKEIT" @@ -5228,7 +5211,7 @@ msgstr "ABHÄNGIGKEIT" msgid "Dependent item" msgstr "Abhängiger Datenpunkt" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5437,10 +5420,10 @@ msgstr "Ausgewählte Web Szenarios löschen?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5524,7 +5507,7 @@ msgid "Discovery by proxy" msgstr "Suchlauf durch Proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Suchlaufprüfung" @@ -5536,7 +5519,7 @@ msgstr "Suchlaufprüfungen" msgid "Discovery list" msgstr "Suchlaufliste" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Suchlaufobjekt" @@ -5636,7 +5619,7 @@ msgstr "Suchlaufregel aktualisiert" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5647,7 +5630,7 @@ msgstr "Suchläufe" msgid "Discovery rules deleted" msgstr "Suchlaufregel gelöscht" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Suchlaufstatus" @@ -5803,18 +5786,6 @@ msgstr "Anzeige" msgid "Draw style" msgstr "Anzeigestil" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Duplizierter \"%1$s\"-Wert \"%2$s\" für Korrelation." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5827,11 +5798,6 @@ msgstr "Doppelter \"name\" Wert \"%1$s\" für Karte." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "Doppelte \"usrgrpid\" \"%1$s\" in Benutzergruppen für Karte \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "Doppelte Bedingungen für Korrelation \"%1$s\"." - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5994,10 +5960,6 @@ msgstr "SSL Schlüsseldatei leer für Web Szenario \"%1$s\"." msgid "Empty color." msgstr "Leere Farbe." -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "Leere Korrelations ID." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6024,11 +5986,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "Leere Filterbedingungsart für Aktion \"%1$s\"." #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6213,7 +6173,7 @@ msgstr "Trapper einschalten" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6224,7 +6184,7 @@ msgstr "Trapper einschalten" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6267,7 +6227,7 @@ msgid "English (en_US)" msgstr "Englisch (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6342,7 +6302,7 @@ msgid "Event correlation" msgstr "Ereigniskorrelation" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Regeln für Ereigniskorrelation" @@ -6377,11 +6337,11 @@ msgstr "Ereignisprotokoll-Überwachung. Rückgabewert Log" msgid "Event name" msgstr "Ereignisname" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Ereignis Marker" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Ereignistyp" @@ -6718,7 +6678,6 @@ msgstr "Feld \"%1$s\" darf nicht NULL sein." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7087,7 +7046,7 @@ msgstr "Hole Wert vom Host" msgid "Given expression is not a macro" msgstr "Übergebene Expression ist kein Makro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "Der globale reguläre Ausdruck \"%1$s\" existiert nicht." @@ -7332,12 +7291,12 @@ msgstr "Raster" msgid "Group" msgstr "Gruppe" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Gruppe \"%1$s\" kann nicht gelöscht werden, da sie von einem Host-Prototyp verwendet wird." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "Gruppe \"%1$s\" kann nicht gelöscht werden, da sie in einem Zustands-Korrelation verwendet wird." @@ -7672,7 +7631,7 @@ msgstr[1] "Host" msgid "Host \"%1$s\" already exists." msgstr "Host \"%1$s\" existiert bereits." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7680,7 +7639,7 @@ msgstr "Host \"%1$s\" existiert bereits." msgid "Host \"%1$s\" cannot be without host group." msgstr "Host \"%1$s\" kann nicht ohne Host-Gruppe sein." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "Host \"%1$s\" wird von Proxy \"%2$s\" überwacht." @@ -7752,17 +7711,17 @@ msgstr[1] "Hosts aktiviert" msgid "Host group" msgstr "Hostgruppe" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Hostgruppe \"%1$s\" existiert bereits." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Systemgruppe \"%1$s\" kann nicht gelöscht werden weil ein globales Skript sie verwendet." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "Die Hostgruppe \"%1$s\" ist intern und kann nicht gelöscht werden." @@ -7776,9 +7735,9 @@ msgid "Host group label type" msgstr "Beschriftung Hostgruppe" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "Host-Gruppe mit ID \"%1$s\" ist nicht verfügbar." @@ -7794,8 +7753,8 @@ msgstr "Host-Gruppe mit ID \"%1$s\" ist nicht verfügbar." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7982,7 +7941,7 @@ msgstr "Host mit identischen, sichtbarem Namen \"%1$s\" bereits vorhanden." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8070,7 +8029,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP-Adresse" @@ -8095,7 +8054,7 @@ msgstr "IP-Bereich \"%1$s\" überschreitet \"%2$s\" Adressbereich" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8152,12 +8111,12 @@ msgstr "Symbol hervorheben" msgid "Icon map" msgstr "Symbolübersicht" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "Icon Symbolübersicht \"%1$s\" existiert bereits." -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Symolzuordnung \"%1$s\" kann nicht gelöscht werden; benutzt in Karte \"%2$s\"." @@ -8181,7 +8140,7 @@ msgstr "Symbolzuordnung geändert" msgid "Icon mapping" msgstr "Symbol zuordnen" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "Symbol mit ID \"%1$s\" ist nicht verfügbar." @@ -8412,7 +8371,7 @@ msgstr "Unerreichbarer Datenpunkt-Prototyp" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8425,11 +8384,11 @@ msgstr "Unerreichbare Karte" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "Unerreichbare Vorlage" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "Unzugänglicher Auslöser" @@ -8641,24 +8600,6 @@ msgstr "Unzulässige Aktionsoperation: Benutzergruppe. Benutzergruppe existiert msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Unzulässiger Benutzer für Aktionsoperation. Benutzer existiert nicht oder Sie haben keinen Zugriff auf ihn." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8743,20 +8684,11 @@ msgstr "Unzulässige Aktionsbedingung: Port \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Unzulässige Aktionsbedingung in Suchlaufregel \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "Unzulässige Korrelations ID." - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "Falscher benutzerdefinierter Ausdruck \"%2$s\" für Aktion \"%1$s\": %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "Falscher benutzerdefinierter Ausdruck \"%2$s\" für Korrelation \"%1$s\": %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8821,11 +8753,6 @@ msgstr "Falscher Filter Bedingung Formel-ID für die Aktion \"%1$s\"." msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Falsche Filterbedingung Formel-ID für die Suchlaufregel \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "Falscher Filter Bedingung Formel-ID für die Korrelation \"%1$s\" gegeben." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8933,7 +8860,7 @@ msgstr "Falsche Karten-ID." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Falsche Methode \"%1$s.%2$s\"." @@ -9047,11 +8974,6 @@ msgstr "Falsche Auslöser-Prototyp-Ausdruck. Die Elemente eines Ausdrucks sollte msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Falsche Art der Berechnung für die Aktion \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "Falsche Art der Berechnung für die Korrelation \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9073,10 +8995,10 @@ msgstr "Falsche Benutzer-ID für Karte \"%1$s\" angegeben." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "Falsche Gruppen-ID für Karte \"%1$s\" angegeben." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "Falscher Benutzername oder falsches Passwort oder Konto ist vorübergehend gesperrt." @@ -9138,18 +9060,6 @@ msgstr "Falscher Wert \"%1$s\" für das Ganzzahl-Feld \"%2$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Falscher Wert \"%1$s\" für das vorzeichenlose Ganzzahl-Feld \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "Falscher Wert \"%1$s\" im Feld \"%2$s\" Korrelation \"%3$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9211,12 +9121,6 @@ msgstr "Falscher Wert für das Feld \"%1$s\"." #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9328,7 +9232,7 @@ msgstr "Falscher Wert für das Feld \"%1$s\"." #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9339,9 +9243,9 @@ msgstr "Falscher Wert für das Feld \"%1$s\"." #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9492,7 +9396,7 @@ msgstr "Vererbte und auslösende Tags" msgid "Inherited items" msgstr "Vererbte Datenpunkte" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Einfügen" @@ -9620,7 +9524,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Intervall" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "Ungültige API-Methode \"%2$s\" für Benutzerrolle \"%1$s\"." @@ -9643,7 +9547,7 @@ msgstr "Ungültiger Inhalt der YAML-Datei" msgid "Invalid action condition: %1$s." msgstr "Ungültige Aktionsbedingung: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "Ungültige Bedingung: %1$s." @@ -9657,7 +9561,7 @@ msgstr "Ungültiges Datum." msgid "Invalid email address \"%1$s\"." msgstr "Ungültige E-Mail Adresse \"%1$s\"." -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "Ungültige E-Mail Adresse für Medientyp mit ID \"%1$s\"." @@ -9704,9 +9608,11 @@ msgstr "Ungültige Methoden-Parameter." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9746,17 +9652,17 @@ msgstr "Ungültige Methoden-Parameter." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9764,14 +9670,14 @@ msgstr "Ungültige Methoden-Parameter." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9779,111 +9685,116 @@ msgstr "Ungültige Methoden-Parameter." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10094,7 +10005,7 @@ msgstr[1] "Datenpunkte aktiviert" msgid "Item in \"not supported\" state" msgstr "Element im Zustand \"nicht unterstützt\"" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Datenpunkt nicht ausgewählt" @@ -10273,7 +10184,7 @@ msgstr "Datenpunkte geändert" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10467,7 +10378,7 @@ msgstr "Beschriftungsposition" msgid "Language" msgstr "Sprache" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "Sprache \"%1$s\" ist nicht unterstützt." @@ -11068,7 +10979,7 @@ msgstr "Verwalten von geplanten Berichten" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11311,7 +11222,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "Maximal darstellbare Zeitspanne ist %1$s Tag." msgstr[1] "Maximal darstellbare Zeitspanne ist %1$s Tage." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "Maximale Gesamtlänge der E-Mail Adresse für Medientyp mit ID \"%1$s\" überschritten." @@ -11336,7 +11247,7 @@ msgstr "Medien" msgid "Media type" msgstr "Medientyp" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Der Medientyp \"%1$s\" existiert bereits." @@ -11380,7 +11291,7 @@ msgstr "Test des Medientyps erfolgreich." msgid "Media type updated" msgstr "Medientyp geändert" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "Medientyp der ID \"%1$s\" ist nicht verfügbar." @@ -11392,7 +11303,7 @@ msgstr "Medientyp der ID \"%1$s\" ist nicht verfügbar." msgid "Media types" msgstr "Medientypen" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "Von der Aktion \"%1$s\" verwendete Medientypen." @@ -11639,7 +11550,7 @@ msgstr[1] "Module aktiviert: %1$s." msgid "Module updated: %1$s." msgstr "Modul aktualisiert: %1$s." -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "Das Modul mit der ID \"%2$s\" ist für die Benutzerrolle \"%1$s\" nicht verfügbar." @@ -12041,15 +11952,17 @@ msgstr "Neue Übersichtsseite" msgid "New element" msgstr "Neues Element" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Neuer Ereignis-Marker Wert" @@ -12069,7 +11982,7 @@ msgstr "Neuer Dienst" msgid "New service time" msgstr "Neue Servicezeit" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12096,7 +12009,7 @@ msgstr "Nächster Schritt" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12125,30 +12038,6 @@ msgstr "Nächster Schritt" msgid "No" msgstr "Nein" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "Kein \"%1$s\" für Korrelation \"%2$s\" übergeben." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "Kein \"%1$s\" für die Korrelation übergeben." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12198,11 +12087,6 @@ msgstr "Kein Benutzername für Authentifizierung angegeben." msgid "No changes." msgstr "Keine Änderungen" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "Keine Konditionsart für Korrelation \"%1$s\"angegeben." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12341,17 +12225,46 @@ msgstr "Keine Treffer gefunden" msgid "No new modules discovered" msgstr "Keine neuen Module entdeckt" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "Kein Operationstyp für Korrelation \"%1$s\" angegeben." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Keine Berechtigung zum Zugriff auf die Oberfläche." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "Keine Berechtigung zum Aufruf von \"%1$s.%2$s\"." @@ -12387,10 +12300,9 @@ msgstr "Keine Berechtigung zum Aufruf von \"%1$s.%2$s\"." #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12418,13 +12330,18 @@ msgstr "Keine Berechtigung zum Aufruf von \"%1$s.%2$s\"." #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12444,8 +12361,8 @@ msgstr "Keine Berechtigung zum Aufruf von \"%1$s.%2$s\"." #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12468,24 +12385,24 @@ msgstr "Keine Berechtigung zum Aufruf von \"%1$s.%2$s\"." #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12507,16 +12424,16 @@ msgstr "Keine Berechtigung zum Aufruf von \"%1$s.%2$s\"." #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12572,7 +12489,7 @@ msgstr "Keine Auslöser definiert." msgid "No value" msgstr "Kein Wert" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Nicht boolesche Markierungen sind veraltet." @@ -12642,15 +12559,15 @@ msgstr "Es werden nicht alle Ergebnisse angezeigt. Bitte geben Sie genauere Such msgid "Not all templates are linked to \"%1$s\"." msgstr "Nicht alle Vorlagen sind mit \"%1$s\" verknüpft." -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "Nicht erlaubt, Sprache für Benutzer \"guest\" zu setzen." -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Nicht erlaubt, Passwort für Benutzer \"guest\" zu setzen." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "Es ist nicht erlaubt, das Thema für den Benutzer \"Gast\" festzulegen." @@ -12986,15 +12903,16 @@ msgstr "Aus" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "Alter Ereignis-Tag-Name" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Alter Ereignis-Marker Wert" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -13016,10 +12934,6 @@ msgstr "Einmal" msgid "One" msgstr "Einer" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Eines der Objekte bleibt ohne eine Host-Gruppe." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Einmalig" @@ -13029,10 +12943,6 @@ msgstr "Einmalig" msgid "One-time downtime" msgstr "Einmalige Downtime" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Nur Super-Admins können Hostgruppen erstellen." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Nur Zabbix Agent, SNMPv1, SNMPv2 und SNMPv3 Checks können einzigartig gemacht werden." @@ -13081,10 +12991,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Nur Super-Admins können Korrelationen erstellen." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "Nur Super-Admins können den Übersichtsseiten-Besitzer festlegen." @@ -13093,10 +12999,6 @@ msgstr "Nur Super-Admins können den Übersichtsseiten-Besitzer festlegen." msgid "Only super admins can set report owner." msgstr "Nur Superadmins können den Berichtseigentümer festlegen." -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Nur Super-Admins können Korrelationen aktualisieren." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Nur Auslöser, die mit aktiven Hosts und aktiven Datenpunkten verbunden sind, werden gezählt" @@ -13146,7 +13048,7 @@ msgstr "Operation hat keine zugeordneten Vorlagen zur Ausführung." msgid "Operational data" msgstr "Operative Daten" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13155,33 +13057,33 @@ msgstr "Operative Daten" msgid "Operations" msgstr "Operationen" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operator" @@ -13592,16 +13494,16 @@ msgstr "" msgid "Parameter" msgstr "Parameter" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Parameter \"%1$s\" ist veraltet." @@ -13739,7 +13641,7 @@ msgstr "" msgid "Paste without external links" msgstr "Ohne externe Links einfügen" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "Muster" @@ -13785,7 +13687,7 @@ msgstr "Führt eine DNS-Abfrage durch. Gibt eine Zeichenkette mit dem gewünscht #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13918,7 +13820,7 @@ msgstr "Befüllt das Inventarfeld des Hosts" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14239,7 +14141,7 @@ msgstr "Proxys" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14247,7 +14149,7 @@ msgstr "Proxys" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "Proxy \"%1$s\" existiert bereits." @@ -14257,12 +14159,12 @@ msgstr "Proxy \"%1$s\" existiert bereits." msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Proxy \"%1$s\" für Host \"%2$s\" existiert nicht." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "Proxy \"%1$s\" wird von Aktion \"%2$s\" verwendet." -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Suchlaufregel \"%2$s\" verwendet Proxy \"%1$s\"." @@ -14537,7 +14439,7 @@ msgstr "Regulär" msgid "Regular expression" msgstr "Regulärer Ausdruck" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "Regulärer Ausdruck \"%1$s\" existiert bereits." @@ -14797,7 +14699,7 @@ msgid "Replace dependencies" msgstr "Abhängigkeiten ersetzen" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14995,7 +14897,7 @@ msgstr "Antworttyp: Zeichenkette" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Ergebnis" @@ -15238,7 +15140,7 @@ msgstr "SMTP Server Port" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15536,7 +15438,7 @@ msgstr "Umfang" msgid "Script" msgstr "Skript" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Das Skript \"%1$s\" existiert bereits." @@ -15650,7 +15552,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15864,11 +15766,11 @@ msgstr "Wiederherstellung der Dienste" msgid "Service start time must be less than end time." msgstr "Startzeitpunkt des Dienstes muss vor dem Endzeitpunkt liegen." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15880,7 +15782,7 @@ msgstr "" msgid "Service times" msgstr "Servicezeiten" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Servicetyp" @@ -15893,7 +15795,7 @@ msgstr "" msgid "Service updated" msgstr "Dienst geändert" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "Der Dienst mit der ID \"%2$s\" ist für die Benutzerrolle \"%1$s\" nicht verfügbar." @@ -15905,7 +15807,7 @@ msgstr "Der Dienst mit der ID \"%2$s\" ist für die Benutzerrolle \"%1$s\" nicht #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15923,9 +15825,9 @@ msgstr "Dienste aktualisiert" msgid "Session initialization error." msgstr "Fehler bei der Sitzungsinitialisierung." -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Sitzung beendet, bitte neu anmelden." @@ -15987,7 +15889,7 @@ msgstr "Einstellungen" #: 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16839,10 +16741,10 @@ msgstr "Tabelle \"%1$s\" hat keine Spalte namens \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Marker" @@ -16979,7 +16881,7 @@ msgstr "Vorlage" msgid "Template \"%1$s\" already exists." msgstr "Vorlage \"%1$s\" existiert bereits." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17063,7 +16965,7 @@ msgstr "Vorlage mit demselben sichtbaren Namen \"%1$s\" existiert bereits." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17360,7 +17262,7 @@ msgstr "Bis" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17767,7 +17669,7 @@ msgstr "Auslöser geändert" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17831,9 +17733,9 @@ msgstr "Zwei Kartenelemente sollten ausgewählt sein" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17843,7 +17745,7 @@ msgstr "Zwei Kartenelemente sollten ausgewählt sein" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17895,7 +17797,7 @@ msgstr "Informationstyp" msgid "Types" msgstr "Typen" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "Das UI-Element \"%2$s\" ist für die Benutzerrolle \"%1$s\" nicht verfügbar." @@ -17966,8 +17868,8 @@ msgstr "URL sollte sowohl \"name\" als auch \"url\" Felder für die Karte \"%1$s msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "UUIDv4 wird erwartet" @@ -18077,21 +17979,23 @@ msgstr "Einheit" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Unbekannt" @@ -18109,7 +18013,7 @@ msgid "Unknown error" msgstr "Unbekannter Fehler" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Ausgewählter Host enthält keinen solchen Datenpunkt" @@ -18249,7 +18153,7 @@ msgstr "Erreichbar" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18383,37 +18287,37 @@ msgstr "Benutzt in Aktion" msgid "User" msgstr "Benutzer" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "Benutzer \"%1$s\" geht nicht ohne Benutzergruppe." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "Benutzer \"%1$s\" ist Besitzer von Übersichtsseite \"%2$s\"." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18435,13 +18339,13 @@ msgstr "Benutzer hinzugefügt" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Benutzer kann sich nicht selbst eintragen in eine deaktiverte Gruppe oder eine ohne Zugriff auf die Oberfläche." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "Der Benutzer kann seine eigene Rolle nicht ändern." @@ -18465,27 +18369,27 @@ msgstr[1] "Benutzer gelöscht" msgid "User group" msgstr "Benutzergruppe" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Die Benutzergruppe \"%1$s\" existiert bereits." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Benutzer-Gruppe \"%1$s\" wird verwendet in Skript \"%2$s\"." @@ -18519,9 +18423,9 @@ msgstr[1] "Benutzergruppen aktualisiert" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18536,7 +18440,7 @@ msgstr "" msgid "User groups" msgstr "Benutzergruppen" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Benutzer darf sich nicht selbst löschen." @@ -18571,7 +18475,7 @@ msgstr "Benutzerprofil" msgid "User role" msgstr "Benutzerrolle" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18590,7 +18494,7 @@ msgstr[1] "Benutzerrollen gelöscht" msgid "User role updated" msgstr "Benutzerrolle geändert" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18640,12 +18544,12 @@ msgstr "Benutzer geändert" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18956,14 +18860,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19075,11 +18979,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Wert eines beliebigen Windows-Leistungsindikator. Gibt Ganzzahl, Gleitkommazahl, Zeichenkette oder Text zurück (je nach Wunsch)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19617,7 +19522,7 @@ msgstr "jährlich" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19674,7 +19579,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "Sie haben keine Ziele für das globale Skript \"%1$s\" der Aktionsoperation angegeben." #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19807,11 +19711,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "ein DNS-Name wird erwartet" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "boolescher Wert erwartet" @@ -19819,16 +19723,16 @@ msgstr "boolescher Wert erwartet" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "Zeichenfolge erwartet" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "ein Datum im Format JJJJ-MM-TT wird erwartet" @@ -19837,37 +19741,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "ein low-level Suchlauf-Makro wird erwartet" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "Nummer erwartet" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "eine Zahl ist zu groß" @@ -19888,7 +19792,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19896,19 +19800,19 @@ msgstr "" msgid "a time is expected" msgstr "Zeitangabe erwartet" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "Zeitspanne erwartet" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: include/validate.inc.php:221 msgid "a time range is expected" msgstr "es wird ein Zeitraum erwartet" #: app/controllers/CControllerPopupHttpStep.php:94 #: app/controllers/CControllerPopupLldOperation.php:154 -#: include/classes/validators/CApiInputValidator.php:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19958,7 +19862,7 @@ msgstr "alle" msgid "all media" msgstr "Alle Medien" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "eine IP Adresse wird erwartet" @@ -19980,23 +19884,23 @@ msgstr "eine IP Adresse wird erwartet" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "ein Array wird erwartet" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "ein Array oder eine Zeichenfolge wird erwartet" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -20006,7 +19910,7 @@ msgid "an empty string is expected" msgstr "eine leere Zeichenfolge wird erwartet" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "eine gerade Anzahl von hexadezimalen Zeichen wird erwartet" @@ -20014,11 +19918,15 @@ msgstr "eine gerade Anzahl von hexadezimalen Zeichen wird erwartet" msgid "an explicit time is expected" msgstr "eine explizite Zeit ist erwartet" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "eine Integerzahl ist erwartet" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20179,13 +20087,7 @@ msgstr "nicht änderbar" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20216,13 +20118,13 @@ msgstr "nicht änderbar" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20240,14 +20142,14 @@ msgstr "nicht änderbar" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20320,7 +20222,8 @@ msgid "configure" msgstr "konfigurieren" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20411,7 +20314,7 @@ msgstr "absteigend" msgid "description" msgstr "Beschreibung" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "Verzeichnis darf nicht leer sein" @@ -20433,13 +20336,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "Suchregel \"%1$s\" auf Host \"%2$s\" wird nicht überwacht" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "enthält nicht" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "ist ungleich" @@ -20465,7 +20368,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20502,7 +20406,7 @@ msgstr "Ausdruck ist leer" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20593,7 +20497,7 @@ msgstr "Symbol" msgid "image" msgstr "Bild" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20638,15 +20542,19 @@ msgstr "falsche Elementanzahl" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "falsche Syntax bei \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20674,7 +20582,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "Ungültige Adressbereich \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "ungültigen Byte-Sequenz in UTF-8" @@ -20703,27 +20611,27 @@ msgstr "Ungültiger vierter Parameter in Funktion \"%1$s\"" msgid "invalid history storage period" msgstr "Ungültige Speicherdauer für historische Daten" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "ungültiger Hostname" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "Ungültiger regulärer Ausdruck" @@ -20751,7 +20659,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "ist nicht in {} eingeschlossen oder falsch formatiert" @@ -20901,7 +20809,7 @@ msgstr "übereinstimmend" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "Maximaler Zeitraum ist kleiner als der Standardzeitraum des Zeitfilters" @@ -20941,7 +20849,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "die Mindestlänge beträgt %1$s Zeichen" @@ -20968,8 +20876,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20990,8 +20898,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21208,6 +21116,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21253,11 +21165,11 @@ msgstr "" msgid "regular expression" msgstr "Regulärer Ausdruck" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21269,15 +21181,15 @@ msgstr "" msgid "right" msgstr "rechts" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21325,7 +21237,7 @@ msgstr "" msgid "short description" msgstr "Kurzbeschreibung" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21344,15 +21256,15 @@ msgstr "Kurzbeschreibung" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "Sollte leer sein" @@ -21368,31 +21280,31 @@ msgstr "Zeige Symbolzuordnung" msgid "sign in as guest" msgstr "als Gast anmelden" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21400,15 +21312,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21421,7 +21333,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21432,7 +21344,7 @@ msgstr "" msgid "tag" msgstr "Marker" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21441,14 +21353,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "Vorlagen ID \"%1$s\" kommt %2$s mal vor" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21460,20 +21372,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "der Parameter \"%1$s\" fehlt" @@ -21505,7 +21417,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21513,31 +21425,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21551,7 +21463,7 @@ msgstr "Auslöser" msgid "trigger does not allow manual closing" msgstr "Auslöser erlaubt manuelle Schließung nicht" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21563,11 +21475,11 @@ msgstr "Auslöser-Prototyp nicht zu einer anderen Vorlage oder anderem Host vers msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21576,7 +21488,7 @@ msgstr "" msgid "type here to search" msgstr "Hier klicken um zu suchen" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21624,11 +21536,12 @@ msgstr "unerwartetes Ende des Makros" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "unerwarteter Parameter \"%1$s\"" @@ -21654,8 +21567,8 @@ msgstr "unerwarteter Text \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21680,6 +21593,10 @@ msgstr "" msgid "unsupported version number" msgstr "nicht unterstützte Version" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21737,61 +21654,69 @@ msgstr "Wert \"%1$s\" nicht gefunden" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "Wert %1$s ist bereits vorhanden" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "Wert ist zu lang" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21822,15 +21747,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "Wert muss einer von %1$s sein" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21839,7 +21762,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21852,11 +21775,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/el/LC_MESSAGES/frontend.po b/ui/locale/el/LC_MESSAGES/frontend.po index be4f8fec32d..90194d724c5 100644 --- a/ui/locale/el/LC_MESSAGES/frontend.po +++ b/ui/locale/el/LC_MESSAGES/frontend.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Zabbix 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2014-10-03 08:43+0300\n" "Last-Translator: ΓΙΑΝΝΗΣ <yannis@computerstudio.gr>\n" "Language-Team: none\n" @@ -504,7 +504,7 @@ msgstr "Αναγνώριση" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Αναγνωρισμένο" @@ -603,7 +603,7 @@ msgstr "Ενέργεια \"%1$s\" υπάρχει ήδη." msgid "Action \"%1$s\" no operations defined." msgstr "Ενέργεια \"%1$s\" χωρίς καθορισμένες λειτουργίες." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -729,7 +729,7 @@ msgstr "Ενεργό έως" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -740,7 +740,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -996,7 +996,7 @@ msgstr "Ηλικία μικρότερη απο" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1318,7 +1318,7 @@ msgstr "Σε (ώρα:λεπτό)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1327,8 +1327,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1339,6 +1339,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1350,7 +1355,7 @@ msgstr "Τουλάχιστον μία περίοδος συντήρησης να msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1436,7 +1441,7 @@ msgstr "Ταυτοποίηση" msgid "Authentication algorithm" msgstr "Αλγόριθμος ταυτοποίησης" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1485,7 +1490,7 @@ msgstr "" msgid "Auto-login" msgstr "Αυτόματη σύνδεση" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1496,7 +1501,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1755,7 +1760,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1790,7 +1795,7 @@ msgstr "Επανάκληση" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1996,7 +2001,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2118,7 +2123,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Αδύνατη η διαγραφή Zabbix εσωτερικού χρήστη \"%1$s\", απενεργοποιήστε το χρήστη." @@ -2127,7 +2132,7 @@ msgstr "Αδύνατη η διαγραφή Zabbix εσωτερικού χρήσ msgid "Cannot delete action" msgstr "Αδύνατη η διαγραφή ενέργειας" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2194,7 +2199,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2267,7 +2272,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "Αδύνατη η διαγραφή διαμεσολαβητή" msgstr[1] "Αδύνατη η διαγραφή διαμεσολαβητή" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2291,7 +2296,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "Αδύνατη η διαγραφή δέσμης ενεργειών" msgstr[1] "Αδύνατη η διαγραφή δέσμης ενεργειών" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Αδύνατη η διαγραφή δεσμών ενεργειών. Η Δέσμη ενεργειών \"%1$s\" χρησιμοποιείτε στην εργασία ενέργειας \"%2$s\"." @@ -2685,16 +2690,16 @@ msgstr "Δεν βρίσκω αντιστοίχιση τιμής \"%1$s\" με χ msgid "Cannot have empty visible template name." msgstr "Δεν μπορώ να έχω κενό ορατό όνομα σχεδιότυπου." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2707,7 +2712,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "Δεν μπορώ να εισάγω σχεδιότυπο \"%1$s\", συνδεδεμένο σχεδιότυπο \"%2$s\" ανύπαρκτο." msgstr[1] "Δεν μπορώ να εισάγω σχεδιότυπο \"%1$s\", συνδεδεμένα σχεδιότυπα \"%2$s\" ανύπαρκτα." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Αδύνατη η εισαγωγή έκφρασης εναύσματος" @@ -2728,7 +2733,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2790,7 +2795,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Αδύνατη η ανάγνωση απάντησης, ελέγξτε σύνδεση με Zabbix εξυπηρετητή \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Αδύνατη η μετονομασία χρήστη επισκέπτη." @@ -2873,7 +2878,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Αδύνατη η αποσύνδεση και καθαρισμός σεναρίων ιστού." @@ -2886,7 +2891,7 @@ msgstr "Αδύνατη η αποσύνδεση σχεδιότυπου" msgid "Cannot unlink template." msgstr "Αδύνατη η αποσύνδεση σχεδιότυπου." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2948,9 +2953,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Αδύνατη η ενημέρωση εντοπισμένου γραφήματος." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Αδύνατη η ενημέρωση εντοπισμένης ομάδος ξενιστή." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3009,9 +3015,7 @@ msgstr "Αδύνατη η ενημέρωση πρωτότυπου γραφήμα msgid "Cannot update group" msgstr "Αδύνατη η ενημέρωση ομάδος" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Αδύνατη η ενημέρωση ομάδων εντοπισμένων ξενιστών \"%1$s\"." @@ -3096,12 +3100,12 @@ msgstr "Αδύνατη η ενημέρωση χάρτη δικτύου" msgid "Cannot update proxy" msgstr "Αδύνατη η ενημέρωση διαμεσολαβητή" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Αδύνατη η ενημέρωση διαμεσολαβητή εντοπισμένου ξενιστή \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3121,9 +3125,9 @@ msgstr "" msgid "Cannot update script" msgstr "Αδύνατη η ενημέρωση δέσμης ενεργειών" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3307,8 +3311,8 @@ msgid "Character string not included" msgstr "Δεν περιλαμβάνεται στοιχειοσειρά χαρακτήρων" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3484,7 +3488,7 @@ msgstr "Ρολόι" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3522,13 +3526,13 @@ msgstr "Κλείσιμο" msgid "Close expression constructor" msgstr "Κλείσιμο κατασκευής έκφρασης" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3625,7 +3629,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3636,11 +3640,6 @@ msgstr "Συνθήκη" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "Συνθήκη \"%2$s\" εκτός χρήσης σε τύπο \"%3$s\" διά ενέργεια \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3656,11 +3655,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "Συνθήκη \"%2$s\" μέ χρήση σε τύπο \"%3$s\" για ενέργεια \"%1$s\" ακαθόριστη." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3852,7 +3846,7 @@ msgstr "Κείμενο επιβεβαίωσης" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4054,12 +4048,11 @@ msgstr "Αντιγραφή" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4086,16 +4079,6 @@ msgid_plural "Correlations enabled" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4106,8 +4089,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Απαρίθμηση" @@ -4479,7 +4462,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS όνομα" @@ -4754,8 +4737,8 @@ msgstr "Δεκ" msgid "December" msgstr "Δεκέμβριος" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4765,7 +4748,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4862,7 +4845,7 @@ msgstr "Καθυστερημένο από" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4912,7 +4895,7 @@ msgstr "Διαγραφή και καθαρισμός σχεδιότυπου; (Π msgid "Delete current action?" msgstr "Διαγραφή τρέχουσας ενέργειας;" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5210,7 +5193,7 @@ msgstr "" msgid "Dependencies" msgstr "Εξαρτήσεις" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Εξαρτημένο" @@ -5218,7 +5201,7 @@ msgstr "Εξαρτημένο" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5427,10 +5410,10 @@ msgstr "Απενεργοποίηση επιλεγμένων σεναρίων ι #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5513,7 +5496,7 @@ msgid "Discovery by proxy" msgstr "Εντοπισμός με διαμεσολαβητή" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Έλεγχος εντοπισμού" @@ -5525,7 +5508,7 @@ msgstr "Έλεγχοι εντοπισμών" msgid "Discovery list" msgstr "Κατάλογος εντοπισμού" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Αντικείμενο εντοπισμού" @@ -5625,7 +5608,7 @@ msgstr "Κανόνας εντοπισμού ενημερώθηκε" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5636,7 +5619,7 @@ msgstr "Κανόνες εντοπισμού" msgid "Discovery rules deleted" msgstr "Κανόνες εντοπισμού διεγράφησαν" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Κατάσταση εντοπισμού" @@ -5792,18 +5775,6 @@ msgstr "" msgid "Draw style" msgstr "Τρόπος σχεδίασης" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5816,11 +5787,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5980,10 +5946,6 @@ msgstr "Κενό αρχείο κλειδιού SSL γιά σενάριο ιστ msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6010,11 +5972,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6199,7 +6159,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6210,7 +6170,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6253,7 +6213,7 @@ msgid "English (en_US)" msgstr "Αγγλικά (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6329,7 +6289,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6364,11 +6324,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Τύπος συμβάντος" @@ -6704,7 +6664,6 @@ msgstr "Πεδίο \"%1$s\" δεν ορίζεται NULL." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7072,7 +7031,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Η δοσμένη έκφραση δεν είναι μακροεντολή" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7317,12 +7276,12 @@ msgstr "Πλέγμα" msgid "Group" msgstr "Ομάδα" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Ομάδα \"%1$s\" δεν διαγράφεται, διότι χρησιμοποιείται σε πρωτότυπο ξενιστή." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7654,7 +7613,7 @@ msgstr[1] "Ξενιστές" msgid "Host \"%1$s\" already exists." msgstr "Ο ξενιστής \"%1$s\" υπάρχει ήδη." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7662,7 +7621,7 @@ msgstr "Ο ξενιστής \"%1$s\" υπάρχει ήδη." msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7733,17 +7692,17 @@ msgstr[1] "Ξενιστές ενεργοποιημένοι" msgid "Host group" msgstr "Ομάδα ξενιστών" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Ομάδα ξενιστών \"%1$s\" υπάρχει ήδη." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Ομάδα ξενιστών \"%1$s\" μη διαγραφόμενη, διότι χρησιμοποιείται σε καθολική δέσμη ενεργειών." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7757,9 +7716,9 @@ msgid "Host group label type" msgstr "Τύπος ετικέτας ομάδος ξενιστών" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7775,8 +7734,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7964,7 +7923,7 @@ msgstr "Ξενιστής με ίδιο ορατό όνομα \"%1$s\" υπάρχ #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8052,7 +8011,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP διεύθυνση" @@ -8077,7 +8036,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8134,12 +8093,12 @@ msgstr "Εικόνα τονισμένη" msgid "Icon map" msgstr "Αντιστοίχιση εικονιδίων" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Η Αντιστοίχιση εικονιδίου \"%1$s\" δεν διαγράφεται. Σε χρήση στον χάρτη \"%2$s\"." @@ -8163,7 +8122,7 @@ msgstr "Αντιστοίχιση εικονιδίου ενημερώθηκε" msgid "Icon mapping" msgstr "Αντιστοιχία εικονιδίου" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8394,7 +8353,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8407,11 +8366,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8623,24 +8582,6 @@ msgstr "Λανθασμένη ομάδα χρήστη εργασίας ενέργ msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Λανθασμένος χρήστης εργασίας ενέργειας. Ο χρήστης δεν υπάρχει ή δεν έχετε πρόσβαση σε αυτόν." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8725,20 +8666,11 @@ msgstr "Λανθασμένες συνθήκες ενέργειας \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Λανθασμένες συνθήκες κανόνα εντοπισμού \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: 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." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8803,11 +8735,6 @@ msgstr "Λανθασμένο φίλτρο ID είδους συνθήκης γι msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Λανθασμένο φίλτρο ID είδους συνθήκης γιά κανόνα εντοπισμού \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8915,7 +8842,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Ανακριβής μέθοδος \"%1$s.%2$s\"." @@ -9029,11 +8956,6 @@ msgstr "Λανθασμένη έκφραση πρωτότυπου εναύσμα msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Λανθασμένος τύπος υπολογισμού ενέργειας \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9055,10 +8977,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9120,18 +9042,6 @@ msgstr "Λανθασμένη τιμή \"%1$s\" για πεδίο ακεραίο msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Λανθασμένη τιμή \"%1$s\" για πεδίο απρόσημου ακέραιου \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9193,12 +9103,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9310,7 +9214,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9321,9 +9225,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9474,7 +9378,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Εισαγωγή" @@ -9602,7 +9506,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Χρονικό διάστημα" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9625,7 +9529,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9639,7 +9543,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9686,9 +9590,11 @@ msgstr "Άκυρες παράμετροι μεθόδου." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9728,17 +9634,17 @@ msgstr "Άκυρες παράμετροι μεθόδου." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9746,14 +9652,14 @@ msgstr "Άκυρες παράμετροι μεθόδου." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9761,111 +9667,116 @@ msgstr "Άκυρες παράμετροι μεθόδου." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10076,7 +9987,7 @@ msgstr[1] "Συλλέκτες ενεργοποιημένοι" msgid "Item in \"not supported\" state" msgstr "Συλλέκτης σε \"ανυποστήρικτη\" κατάσταση" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Συλλέκτης μή επιλεγμένος" @@ -10256,7 +10167,7 @@ msgstr "Συλλέκτες ενημερώθηκαν" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10449,7 +10360,7 @@ msgstr "Θέση επιγραφής" msgid "Language" msgstr "Γλώσσα" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11050,7 +10961,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11292,7 +11203,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "Μέγιστη χρονική περίοδος εμφάνισης %1$s ημέρα." msgstr[1] "Μέγιστη χρονική περίοδος εμφάνισης %1$s ημέρες." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11317,7 +11228,7 @@ msgstr "Μέσα ενημέρωσης" msgid "Media type" msgstr "Τύπος μέσων" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11362,7 +11273,7 @@ msgstr "" msgid "Media type updated" msgstr "Τύπος μέσων ενημερώθηκε" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11374,7 +11285,7 @@ msgstr "" msgid "Media types" msgstr "Τύποι μέσων ενημέρωσης" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11621,7 +11532,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12023,15 +11934,17 @@ msgstr "" msgid "New element" msgstr "Νέο στοιχείο" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12051,7 +11964,7 @@ msgstr "" msgid "New service time" msgstr "Νέος χρόνος υπηρεσίας" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12078,7 +11991,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12107,30 +12020,6 @@ msgstr "" msgid "No" msgstr "Όχι" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12180,11 +12069,6 @@ msgstr "Δεν καθορίστηκε όνομα χρήστη αυθεντικό msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12323,17 +12207,46 @@ msgstr "Δεν βρέθηκαν ταιριάσματα" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Χωρίς δικαιώματα για πρόσβαση συστήματος." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12369,10 +12282,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12400,13 +12312,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12426,8 +12343,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12450,24 +12367,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12489,16 +12406,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12554,7 +12471,7 @@ msgstr "Δεν ορίσθηκαν εναύσματα." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12624,15 +12541,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Δεν επιτρέπεται ορισμός συνθηματικού για χρήστη \"guest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12966,15 +12883,16 @@ msgstr "Εκτός" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12996,10 +12914,6 @@ msgstr "Άπαξ" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Ένα των αντικειμένων χωρίς ομάδα ξενιστή." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Μία φορά μόνο" @@ -13009,10 +12923,6 @@ msgstr "Μία φορά μόνο" msgid "One-time downtime" msgstr "Μία φορά μή διαθέσιμο" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Μόνο Υπερ Διαχειριστές δημιουργούν ομάδες ξενιστών." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Μοναδικοί έλεγχοι μόνο Zabbix agent, SNMPv1, SNMPv2 and SNMPv3." @@ -13061,10 +12971,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13073,10 +12979,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Απαριθμώνται μόνο εναύσματα εκχωρημένα σε ενεργούς ξενιστές και εξαρτώμενα απο ενεργούς συλλέκτες" @@ -13125,7 +13027,7 @@ msgstr "Η λειτουργία δεν έχει σχεδιότυπο να λει msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13134,33 +13036,33 @@ msgstr "" msgid "Operations" msgstr "Λειτουργίες" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Χειριστής" @@ -13569,16 +13471,16 @@ msgstr "" msgid "Parameter" msgstr "Παράμετρος" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13715,7 +13617,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13761,7 +13663,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13894,7 +13796,7 @@ msgstr "Συμπληρώνει πεδίο απογραφής ξενιστή" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14215,7 +14117,7 @@ msgstr "Διαμεσολαβητές" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14223,7 +14125,7 @@ msgstr "Διαμεσολαβητές" msgid "Proxy" msgstr "Διαμεσολαβητής" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14233,12 +14135,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Διαμεσολαβητής \"%1$s\" για ξενιστή \"%2$s\" δεν υπάρχει." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Διαμεσολαβητής \"%1$s\" σε χρήση από κανόνα εντοπισμού \"%2$s\"." @@ -14514,7 +14416,7 @@ msgstr "" msgid "Regular expression" msgstr "Κανονική έκφραση" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14774,7 +14676,7 @@ msgid "Replace dependencies" msgstr "Αντικατάσταση εξαρτήσεων" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14971,7 +14873,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Αποτέλεσμα" @@ -15212,7 +15114,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15510,7 +15412,7 @@ msgstr "" msgid "Script" msgstr "Δέσμη ενεργειών" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Δέσμη ενεργειών \"%1$s\" υπάρχει ήδη." @@ -15625,7 +15527,7 @@ msgid "Security name" msgstr "Όνομα ασφάλειας" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15840,11 +15742,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Χρόνος έναρξης υπηρεσίας πρέπει να είναι μικρότερος του χρόνου λήξης." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15856,7 +15758,7 @@ msgstr "" msgid "Service times" msgstr "Χρόνοι υπηρεσίας" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Τύπος υπηρεσίας" @@ -15869,7 +15771,7 @@ msgstr "" msgid "Service updated" msgstr "Υπηρεσία ενημερώθηκε" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15881,7 +15783,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15899,9 +15801,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Τερματισμός συνεδρίας. Επανασυνδεθείτε." @@ -15963,7 +15865,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16808,10 +16710,10 @@ msgstr "Ο πίνακας \"%1$s\" δεν έχει πεδίο με όνομα \" #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Ετικέτα" @@ -16948,7 +16850,7 @@ msgstr "Σχεδιότυπο" msgid "Template \"%1$s\" already exists." msgstr "Το σχεδιότυπο \"%1$s\" υπάρχει ήδη." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17032,7 +16934,7 @@ msgstr "Σχεδιότυπο με ίδιο ορατό όνομα \"%1$s\" υπά #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17329,7 +17231,7 @@ msgstr "Έως" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17737,7 +17639,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17801,9 +17703,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17813,7 +17715,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17865,7 +17767,7 @@ msgstr "Τύπος πληροφοριών" msgid "Types" msgstr "Τύποι" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17936,8 +17838,8 @@ msgstr "" msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18047,21 +17949,23 @@ msgstr "Μονάδες" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Άγνωστο" @@ -18079,7 +17983,7 @@ msgid "Unknown error" msgstr "Άγνωστο σφάλμα" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Άγνωστος συλλέκτης ξενιστή, κανένας τέτοιος συλλέκτης σε επιλεγμένο ξενιστή" @@ -18218,7 +18122,7 @@ msgstr "Ανοικτά" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18352,37 +18256,37 @@ msgstr "Χρησιμοποιείται σε ενέργειες" msgid "User" msgstr "Χρήστης" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18404,13 +18308,13 @@ msgstr "Χρήστης προστέθηκε" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Χρήστης δεν αυτοπροστίθεται σε απενεργοποιημένη ομάδα ή ομάδα απενεργοποιημένης πρόσβασης GUI." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18434,27 +18338,27 @@ msgstr[1] "" msgid "User group" msgstr "Ομάδα χρήστη" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Ομάδα χρήστη \"%1$s\" υπάρχει ήδη." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Ομάδα χρήστη \"%1$s\" χρησιμοποιείται σε ρύθμιση μηνυμάτων πτώσης βάσης." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Ομάδα χρήστη \"%1$s\" χρησιμοποιείται στη δέσμη ενεργειών \"%2$s\"." @@ -18488,9 +18392,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18505,7 +18409,7 @@ msgstr "" msgid "User groups" msgstr "Ομάδες χρηστών" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Ο χρήστης δεν επιτρέπεται να διαγράψει τον εαυτό του." @@ -18540,7 +18444,7 @@ msgstr "Προφιλ χρήστη" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18559,7 +18463,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18609,12 +18513,12 @@ msgstr "Χρήστης ενημερώθηκε" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18925,14 +18829,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19044,11 +18948,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19585,7 +19490,7 @@ msgstr "Ετησίως" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19642,7 +19547,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19775,11 +19679,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19787,16 +19691,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19805,37 +19709,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19856,7 +19760,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19864,19 +19768,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19926,7 +19830,7 @@ msgstr "όλα" msgid "all media" msgstr "όλα τα μέσα" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19948,23 +19852,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19974,7 +19878,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19982,11 +19886,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20147,13 +20055,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20184,13 +20086,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20208,14 +20110,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20288,7 +20190,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20379,7 +20282,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20401,13 +20304,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20433,7 +20336,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20470,7 +20374,7 @@ msgstr "κενή έκφραση" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20562,7 +20466,7 @@ msgstr "εικονίδιο" msgid "image" msgstr "εικόνα" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20607,15 +20511,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "ανακριβής σύνταξη πλησίον \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20643,7 +20551,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20672,27 +20580,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20720,7 +20628,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20870,7 +20778,7 @@ msgstr "ταιριάσματα" msgid "max" msgstr "μεγ." -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20910,7 +20818,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20937,8 +20845,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20959,8 +20867,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21176,6 +21084,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21221,11 +21133,11 @@ msgstr "" msgid "regular expression" msgstr "κανονική έκφραση" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21237,15 +21149,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21293,7 +21205,7 @@ msgstr "" msgid "short description" msgstr "σύντομη περιγραφή" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21312,15 +21224,15 @@ msgstr "σύντομη περιγραφή" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21336,31 +21248,31 @@ msgstr "εμφάνιση αντιστοιχίσεων εικονίδιου" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21368,15 +21280,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21389,7 +21301,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21400,7 +21312,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21409,14 +21321,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "το ID σχεδιότυπου \"%1$s\" πέρασε %2$s φορές" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21428,20 +21340,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21473,7 +21385,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21481,31 +21393,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21519,7 +21431,7 @@ msgstr "έναυσμα" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21531,11 +21443,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21544,7 +21456,7 @@ msgstr "" msgid "type here to search" msgstr "Πληκτρολογήστε για αναζήτηση" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21592,11 +21504,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21622,8 +21535,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21648,6 +21561,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21705,61 +21622,69 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21790,15 +21715,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21807,7 +21730,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21820,11 +21743,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/es/LC_MESSAGES/frontend.po b/ui/locale/es/LC_MESSAGES/frontend.po index 3e03c379cae..effec2c5bd2 100644 --- a/ui/locale/es/LC_MESSAGES/frontend.po +++ b/ui/locale/es/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2014-10-01 18:50+0300\n" "Last-Translator: Saúl <saulortega.co@gmail.com>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -500,7 +500,7 @@ msgstr "Aceptada" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Reconocida" @@ -599,7 +599,7 @@ msgstr "La acción \"%1$s\" ya existe." msgid "Action \"%1$s\" no operations defined." msgstr "La acción \"%1$s\" no tiene operaciones definidas." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -725,7 +725,7 @@ msgstr "Activo hasta" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -736,7 +736,7 @@ msgstr "Activo hasta" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -992,7 +992,7 @@ msgstr "Edad menor que" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1314,7 +1314,7 @@ msgstr "En (horas:minutos)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1323,8 +1323,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1335,6 +1335,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1346,7 +1351,7 @@ msgstr "Debe crearse al menos un periodo de mantenimiento." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1432,7 +1437,7 @@ msgstr "Autenticación" msgid "Authentication algorithm" msgstr "Algoritmo de autenticación" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1481,7 +1486,7 @@ msgstr "" msgid "Auto-login" msgstr "Acceso automático" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Las opciones inicio y cierre de sesión automáticos no pueden ser habilitadas al mismo tiempo." @@ -1492,7 +1497,7 @@ msgstr "Cierre de sesión automático" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1751,7 +1756,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1786,7 +1791,7 @@ msgstr "Devolución de llamada" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1992,7 +1997,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2114,7 +2119,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "No se puede borrar el usuario \"%1$s\", prueba deshabilitandolo primero." @@ -2123,7 +2128,7 @@ msgstr "No se puede borrar el usuario \"%1$s\", prueba deshabilitandolo primero. msgid "Cannot delete action" msgstr "No es posible eliminar la acción" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2191,7 +2196,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2262,7 +2267,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "No es posible eliminar el proxy" msgstr[1] "No es posible eliminar el proxy" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2285,7 +2290,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "No es posible eliminar el script" msgstr[1] "No es posible eliminar el script" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "No es posible eliminar los scripts. script \"%1$s\" es usado en accioón \"%2$s\"." @@ -2679,16 +2684,16 @@ msgstr "No se pudo encontrar el mapa de valores \"%1$s\" usado en el prototipo d msgid "Cannot have empty visible template name." msgstr "No puede tener un nombre visible de plantilla vacío." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2701,7 +2706,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "No se pudo importar la plantilla \"%1$s\" porque la plantilla enlazada \"%2$s\" no existe." msgstr[1] "No se pudo importar la plantilla \"%1$s\" porque las plantillas enlazadas \"%2$s\" no existen." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "No se pudo insertar la expresión del disparador" @@ -2722,7 +2727,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2784,7 +2789,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "No se pudo leer la respuesta. Verifique la conexión con el servidor Zabbix \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "No se puede cambiar el nombre al usuario guest." @@ -2867,7 +2872,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "No se puede desenlazar y limpiar un escenario web." @@ -2880,7 +2885,7 @@ msgstr "No se pudo desenlazar la plantilla" msgid "Cannot unlink template." msgstr "No se pudo desenlazar la plantilla." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2942,9 +2947,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "No se puede actualizar una gráfica descubierta." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "No se puede actualizar un grupo de equipos descubierto." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3003,9 +3009,7 @@ msgstr "No se pudo actualizar el prototipo de gráfica" msgid "Cannot update group" msgstr "No es posible actualizar el grupo" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "No se pudo actualizar los grupos del equipo descubierto \"%1$s\"." @@ -3090,12 +3094,12 @@ msgstr "No se pudo actualizar el mapa de red" msgid "Cannot update proxy" msgstr "No se pudo actualizar el proxy" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "No se pudo actualizar el proxy del equipo descubierto \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3115,9 +3119,9 @@ msgstr "" msgid "Cannot update script" msgstr "No se pudo actualizar el script" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3301,8 +3305,8 @@ msgid "Character string not included" msgstr "Cadena de caracteres no incluidos" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3478,7 +3482,7 @@ msgstr "Reloj" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3516,13 +3520,13 @@ msgstr "Cerrar" msgid "Close expression constructor" msgstr "Cerrar el constructor de expresiones" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Cerrar nuevo evento" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Cerrar eventos antiguos" @@ -3619,7 +3623,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "Sesiones simultáneas" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3630,11 +3634,6 @@ msgstr "Condición" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "La condición \"%2$s\" no está siendo usada en la fórmula \"%3$s\" de la acción \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "La condición \"%2$s\" no es usada en la fórmula \"%3$s\" para la correlación \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3650,11 +3649,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "La condición \"%2$s\" usada en la fórmula \"%3$s\" de la acción \"%1$s\" no está definida." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "La condición \"%2$s\" usada en la fórmula \"%3$s\" para la correlación \"%1$s\" no está definida." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3846,7 +3840,7 @@ msgstr "Texto de confirmación" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "¡Felicidades! Has instalado la interfaz web de Zabbix satisfactoriamente." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4048,12 +4042,11 @@ msgstr "Copiar" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Correlación" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "Ya existe la correlación \"%1$s\"." @@ -4081,16 +4074,6 @@ msgid_plural "Correlations enabled" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4101,8 +4084,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Contador" @@ -4474,7 +4457,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "Nombre DNS" @@ -4749,8 +4732,8 @@ msgstr "Dic" msgid "December" msgstr "Diciembre" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4760,7 +4743,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4857,7 +4840,7 @@ msgstr "Demorado por" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4907,7 +4890,7 @@ msgstr "¿Desea eliminar y limpiar la plantilla? (Advertencia: Todos los equipos msgid "Delete current action?" msgstr "¿Desea eliminar la acción actual?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "¿Borrar la correlación actual?" @@ -5205,7 +5188,7 @@ msgstr "" msgid "Dependencies" msgstr "Dependencias" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Dependiente" @@ -5213,7 +5196,7 @@ msgstr "Dependiente" msgid "Dependent item" msgstr "Elemento dependiente" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5422,10 +5405,10 @@ msgstr "¿Desea desactivar los escenarios web seleccionados?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5508,7 +5491,7 @@ msgid "Discovery by proxy" msgstr "Descubierto por proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Comprobación de descubrimiento" @@ -5520,7 +5503,7 @@ msgstr "Comprobaciones de descubrimiento" msgid "Discovery list" msgstr "Lista de descubrimiento" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Objeto de descubrimiento" @@ -5620,7 +5603,7 @@ msgstr "Regla de descubrimiento actualizada" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5631,7 +5614,7 @@ msgstr "Reglas de descubrimiento" msgid "Discovery rules deleted" msgstr "Reglas de descubrimiento eliminadas" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Estado del descubrimiento" @@ -5788,18 +5771,6 @@ msgstr "" msgid "Draw style" msgstr "Estilo del trazado" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "Valor \"%2$s\" duplicado \"%1$s\" para la correlación \"%3$s\"." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5812,11 +5783,6 @@ msgstr "Valor \"nombre\" duplicado \"%1$s\" para el mapa." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5976,10 +5942,6 @@ msgstr "Vaciar el archivo de claves SSL del escenario web \"%1$s\"." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6006,11 +5968,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6195,7 +6155,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6206,7 +6166,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6249,7 +6209,7 @@ msgid "English (en_US)" msgstr "Inglés (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6324,7 +6284,7 @@ msgid "Event correlation" msgstr "Corrrelación de evento" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Reglas de correlación de evento" @@ -6359,11 +6319,11 @@ msgstr "Monitorización del registro de eventos. Devuelve un log" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Par de etiquetas de evento" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Tipo de evento" @@ -6700,7 +6660,6 @@ msgstr "El campo \"%1$s\" no puede estar vacío." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7068,7 +7027,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "La expresión dada no es una macro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7313,12 +7272,12 @@ msgstr "Cuadrícula" msgid "Group" msgstr "Grupo" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "El grupo \"%1$s\" no puede ser eliminado porque está siendo usado por un prototipo de equipo." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7650,7 +7609,7 @@ msgstr[1] "Equipos" msgid "Host \"%1$s\" already exists." msgstr "El equipo \"%1$s\" ya existe." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7658,7 +7617,7 @@ msgstr "El equipo \"%1$s\" ya existe." msgid "Host \"%1$s\" cannot be without host group." msgstr "El equipo \"%1$s\" no puede estar sin grupo de equipos." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7730,17 +7689,17 @@ msgstr[1] "Equipos habilitados" msgid "Host group" msgstr "Grupo del equipo" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Ya existe el grupo de equipos \"%1$s\"." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7754,9 +7713,9 @@ msgid "Host group label type" msgstr "" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7772,8 +7731,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7961,7 +7920,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8049,7 +8008,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "Dirección IP" @@ -8074,7 +8033,7 @@ msgstr "El rango IP \"%1$s\" sobrepasa el límite de direccionamiento \"%2$s\"" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8131,12 +8090,12 @@ msgstr "Icono resaltado" msgid "Icon map" msgstr "Icono asignado" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "No pudo ser borrada la asignación de icono \"%1$s\". En uso en el mapa \"%2$s\"." @@ -8160,7 +8119,7 @@ msgstr "Actualizada la asignación de icono" msgid "Icon mapping" msgstr "Asignación de icono" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "El icono con ID \"%1$s\" no está disponible." @@ -8391,7 +8350,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8404,11 +8363,11 @@ msgstr "Mapa inaccesible" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8621,24 +8580,6 @@ msgstr "" msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "" -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8723,20 +8664,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8801,11 +8733,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8914,7 +8841,7 @@ msgstr "Identificador de mapa incorrecto." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Método incorrecto \"%1$s.%2$s\"." @@ -9028,11 +8955,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9054,10 +8976,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9119,18 +9041,6 @@ msgstr "" msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9192,12 +9102,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9309,7 +9213,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9320,9 +9224,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9473,7 +9377,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Insertar" @@ -9601,7 +9505,7 @@ msgstr "" msgid "Interval" msgstr "" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9624,7 +9528,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9638,7 +9542,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9685,9 +9589,11 @@ msgstr "" #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9727,17 +9633,17 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9745,14 +9651,14 @@ msgstr "" #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9760,111 +9666,116 @@ msgstr "" #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10075,7 +9986,7 @@ msgstr[1] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10254,7 +10165,7 @@ msgstr "Monitores actualizados" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10447,7 +10358,7 @@ msgstr "Posición de la etiqueta" msgid "Language" msgstr "Idioma" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11048,7 +10959,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11290,7 +11201,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11315,7 +11226,7 @@ msgstr "Medio" msgid "Media type" msgstr "Tipo de medio" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11359,7 +11270,7 @@ msgstr "" msgid "Media type updated" msgstr "Tipo de medio actualizado" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11371,7 +11282,7 @@ msgstr "" msgid "Media types" msgstr "Tipos de medios" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11618,7 +11529,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12020,15 +11931,17 @@ msgstr "" msgid "New element" msgstr "Nuevo elemento" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12048,7 +11961,7 @@ msgstr "" msgid "New service time" msgstr "Nuevo tiempo del servicio" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12075,7 +11988,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12104,30 +12017,6 @@ msgstr "" msgid "No" msgstr "No" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12177,11 +12066,6 @@ msgstr "" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12320,17 +12204,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12366,10 +12279,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12397,13 +12309,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12423,8 +12340,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12447,24 +12364,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12486,16 +12403,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12551,7 +12468,7 @@ msgstr "" msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12621,15 +12538,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12963,15 +12880,16 @@ msgstr "INACTIVO" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12993,10 +12911,6 @@ msgstr "Una vez" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "" @@ -13006,10 +12920,6 @@ msgstr "" msgid "One-time downtime" msgstr "Una vez inoperativo" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "" - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -13058,10 +12968,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13070,10 +12976,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Sólo cuentan los iniciadores asignados a equipos habilitados y que dependan de monitores habilitados" @@ -13122,7 +13024,7 @@ msgstr "" msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13131,33 +13033,33 @@ msgstr "" msgid "Operations" msgstr "Operaciones" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operador" @@ -13566,16 +13468,16 @@ msgstr "" msgid "Parameter" msgstr "Parámetro" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13712,7 +13614,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13758,7 +13660,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13891,7 +13793,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14211,7 +14113,7 @@ msgstr "Proxies" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14219,7 +14121,7 @@ msgstr "Proxies" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14229,12 +14131,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Proxy \"%1$s\" para el host \"%2$s\" no existe." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Proxy \"%1$s\" está siendo usado por la regla de descubrimiento \"%2$s\"." @@ -14509,7 +14411,7 @@ msgstr "" msgid "Regular expression" msgstr "Expresión regular" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14769,7 +14671,7 @@ msgid "Replace dependencies" msgstr "Reemplazar dependencias" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14966,7 +14868,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Resultado" @@ -15207,7 +15109,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15505,7 +15407,7 @@ msgstr "" msgid "Script" msgstr "Script" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15619,7 +15521,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15834,11 +15736,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "" -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15850,7 +15752,7 @@ msgstr "" msgid "Service times" msgstr "Tiempos del servicio" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Tipo de servicio" @@ -15863,7 +15765,7 @@ msgstr "" msgid "Service updated" msgstr "Servicio actualizado" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15875,7 +15777,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15893,9 +15795,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "" @@ -15957,7 +15859,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16802,10 +16704,10 @@ msgstr "" #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Etiqueta" @@ -16942,7 +16844,7 @@ msgstr "Plantilla" msgid "Template \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17026,7 +16928,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17323,7 +17225,7 @@ msgstr "Hasta" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17730,7 +17632,7 @@ msgstr "Iniciador actualizado" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17794,9 +17696,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17806,7 +17708,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17858,7 +17760,7 @@ msgstr "Tipo de información" msgid "Types" msgstr "" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17929,8 +17831,8 @@ msgstr "" msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18040,21 +17942,23 @@ msgstr "Unidad" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Desconocido" @@ -18072,7 +17976,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "" @@ -18211,7 +18115,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18345,37 +18249,37 @@ msgstr "" msgid "User" msgstr "Usuario" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18397,13 +18301,13 @@ msgstr "Usuario añadido" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "" #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18427,27 +18331,27 @@ msgstr[1] "" msgid "User group" msgstr "Un grupo de usuarios" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "" @@ -18481,9 +18385,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18498,7 +18402,7 @@ msgstr "" msgid "User groups" msgstr "Grupos de usuarios" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "" @@ -18533,7 +18437,7 @@ msgstr "Perfil de usuario" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18552,7 +18456,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18602,12 +18506,12 @@ msgstr "Usuario actualizado" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18918,14 +18822,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19037,11 +18941,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19578,7 +19483,7 @@ msgstr "Anual" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19635,7 +19540,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19768,11 +19672,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19780,16 +19684,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19798,37 +19702,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19849,7 +19753,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19857,19 +19761,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19919,7 +19823,7 @@ msgstr "todo" msgid "all media" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19941,23 +19845,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19967,7 +19871,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19975,11 +19879,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20140,13 +20048,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20177,13 +20079,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20201,14 +20103,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20281,7 +20183,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20372,7 +20275,7 @@ msgstr "descendiente" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20394,13 +20297,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20426,7 +20329,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20463,7 +20367,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20554,7 +20458,7 @@ msgstr "icono" msgid "image" msgstr "imagen" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20599,15 +20503,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20635,7 +20543,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20664,27 +20572,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20712,7 +20620,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20862,7 +20770,7 @@ msgstr "" msgid "max" msgstr "máximo" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20902,7 +20810,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20929,8 +20837,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20951,8 +20859,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21168,6 +21076,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21213,11 +21125,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21229,15 +21141,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21285,7 +21197,7 @@ msgstr "" msgid "short description" msgstr "descripción corta" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21304,15 +21216,15 @@ msgstr "descripción corta" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21328,31 +21240,31 @@ msgstr "mostrar asignaciones de icono" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21360,15 +21272,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21381,7 +21293,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21392,7 +21304,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21401,14 +21313,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21420,20 +21332,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "falta el parámetro \"%1$s\"" @@ -21465,7 +21377,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21473,31 +21385,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21511,7 +21423,7 @@ msgstr "iniciador" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21523,11 +21435,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21536,7 +21448,7 @@ msgstr "" msgid "type here to search" msgstr "pulse aquí para buscar" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21584,11 +21496,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21614,8 +21527,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21640,6 +21553,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21697,61 +21614,69 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21782,15 +21707,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21799,7 +21722,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21812,11 +21735,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/fa/LC_MESSAGES/frontend.po b/ui/locale/fa/LC_MESSAGES/frontend.po index 293a41ecfb2..449aa85ef6c 100644 --- a/ui/locale/fa/LC_MESSAGES/frontend.po +++ b/ui/locale/fa/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2013-10-10 08:30+0300\n" "Last-Translator: richlv <richlv@nakts.net>\n" "Language-Team: none\n" @@ -479,7 +479,7 @@ msgstr "تأیید کردن" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "تأیید شده" @@ -578,7 +578,7 @@ msgstr "" msgid "Action \"%1$s\" no operations defined." msgstr "" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -702,7 +702,7 @@ msgstr "فعال تا" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -713,7 +713,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -969,7 +969,7 @@ msgstr "سن کمتر از" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1291,7 +1291,7 @@ msgstr "در (ساعت:دقیقه)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1300,8 +1300,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1312,6 +1312,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1323,7 +1328,7 @@ msgstr "" msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1409,7 +1414,7 @@ msgstr "تصدیق هویت" msgid "Authentication algorithm" msgstr "الگوریتم تصدیق هویت" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1458,7 +1463,7 @@ msgstr "" msgid "Auto-login" msgstr "ورود خودکار" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1469,7 +1474,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1728,7 +1733,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1763,7 +1768,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1968,7 +1973,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2086,7 +2091,7 @@ msgid "Cannot delete API token" msgid_plural "Cannot delete API tokens" msgstr[0] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "" @@ -2095,7 +2100,7 @@ msgstr "" msgid "Cannot delete action" msgstr "فعالیت نمیتواند حذف شود" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2158,7 +2163,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group." msgstr[0] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2225,7 +2230,7 @@ msgid "Cannot delete proxy" msgid_plural "Cannot delete proxies" msgstr[0] "پروکسی نمی تواند حذف شود" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2245,7 +2250,7 @@ msgid "Cannot delete script" msgid_plural "Cannot delete scripts" msgstr[0] "اسکریپت نمی تواند حذف شود" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است." @@ -2615,16 +2620,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2636,7 +2641,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist. msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist." msgstr[0] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "" @@ -2656,7 +2661,7 @@ msgid "Cannot load module at: %1$s." msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2718,7 +2723,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "" @@ -2800,7 +2805,7 @@ msgid "Cannot unblock user" msgid_plural "Cannot unblock users" msgstr[0] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "" @@ -2813,7 +2818,7 @@ msgstr "قالب را نمیتوانید جدا کنید" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2875,8 +2880,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -2935,9 +2941,7 @@ msgstr "" msgid "Cannot update group" msgstr "گروه نمیتواند بروز شود" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -3018,12 +3022,12 @@ msgstr "نقشه شبکه نمی تواند بروز شود" msgid "Cannot update proxy" msgstr "پروکسی نمیتواند بروز شود" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3043,9 +3047,9 @@ msgstr "" msgid "Cannot update script" msgstr "اسکریپت نمی تواند بروز شود" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3226,8 +3230,8 @@ msgid "Character string not included" msgstr "در بر نداشتن رشته کاراکتری" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3403,7 +3407,7 @@ msgstr "ساعت" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3441,13 +3445,13 @@ msgstr "بستن" msgid "Close expression constructor" msgstr "بستن عبارت سازنده" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3544,7 +3548,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3555,11 +3559,6 @@ msgstr "شرط" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3575,11 +3574,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3771,7 +3765,7 @@ msgstr "متن تایید" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -3973,12 +3967,11 @@ msgstr "رونوشت" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4002,16 +3995,6 @@ msgid "Correlation enabled" msgid_plural "Correlations enabled" msgstr[0] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4022,8 +4005,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "تعداد" @@ -4395,7 +4378,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "" @@ -4669,8 +4652,8 @@ msgstr "" msgid "December" msgstr "دسامبر" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4680,7 +4663,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4777,7 +4760,7 @@ msgstr "تأخیر توسط" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4827,7 +4810,7 @@ msgstr "" msgid "Delete current action?" msgstr "" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5125,7 +5108,7 @@ msgstr "" msgid "Dependencies" msgstr "وابستگیها" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "وابسته" @@ -5133,7 +5116,7 @@ msgstr "وابسته" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5342,10 +5325,10 @@ msgstr "" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5428,7 +5411,7 @@ msgid "Discovery by proxy" msgstr "کشف با پروکسی" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "تطبیق کشف" @@ -5440,7 +5423,7 @@ msgstr "تطبیق کشف" msgid "Discovery list" msgstr "" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "تطبیق شیء" @@ -5536,7 +5519,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5547,7 +5530,7 @@ msgstr "قوانین کشف" msgid "Discovery rules deleted" msgstr "" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "وضعیت کشف" @@ -5703,18 +5686,6 @@ msgstr "" msgid "Draw style" msgstr "رسم سبک" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5727,11 +5698,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5891,10 +5857,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -5921,11 +5883,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6110,7 +6070,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6121,7 +6081,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6164,7 +6124,7 @@ msgid "English (en_US)" msgstr "" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6240,7 +6200,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6275,11 +6235,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6614,7 +6574,6 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -6982,7 +6941,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7226,12 +7185,12 @@ msgstr "شبکه اى" msgid "Group" msgstr "گروه" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7562,7 +7521,7 @@ msgstr[0] "هاست" msgid "Host \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7570,7 +7529,7 @@ msgstr "" msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7639,17 +7598,17 @@ msgstr[0] "" msgid "Host group" msgstr "گروه هاست" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7663,9 +7622,9 @@ msgid "Host group label type" msgstr "نوع برچسب گروه هاست" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7681,8 +7640,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7868,7 +7827,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -7956,7 +7915,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "آدرس IP" @@ -7981,7 +7940,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8038,12 +7997,12 @@ msgstr "نشان پررنگ" msgid "Icon map" msgstr "نگاشت نشان" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "" @@ -8067,7 +8026,7 @@ msgstr "" msgid "Icon mapping" msgstr "نگاشت نشان" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8296,7 +8255,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8309,11 +8268,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8525,24 +8484,6 @@ msgstr "" msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "" -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8627,20 +8568,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8705,11 +8637,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8817,7 +8744,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -8931,11 +8858,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -8957,10 +8879,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9022,18 +8944,6 @@ msgstr "" msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9095,12 +9005,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9212,7 +9116,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9223,9 +9127,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9376,7 +9280,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "درج" @@ -9504,7 +9408,7 @@ msgstr "" msgid "Interval" msgstr "بازه" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9527,7 +9431,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9541,7 +9445,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9588,9 +9492,11 @@ msgstr "" #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9630,17 +9536,17 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9648,14 +9554,14 @@ msgstr "" #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9663,111 +9569,116 @@ msgstr "" #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -9975,7 +9886,7 @@ msgstr[0] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10153,7 +10064,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10346,7 +10257,7 @@ msgstr "محل برچسب" msgid "Language" msgstr "زبان" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -10941,7 +10852,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11182,7 +11093,7 @@ msgid "Maximum time period to display is %1$s day." msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11207,7 +11118,7 @@ msgstr "رسانه" msgid "Media type" msgstr "نوع رسانه" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11248,7 +11159,7 @@ msgstr "" msgid "Media type updated" msgstr "" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11260,7 +11171,7 @@ msgstr "" msgid "Media types" msgstr "انوع رسانه" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11502,7 +11413,7 @@ msgstr[0] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -11904,15 +11815,17 @@ msgstr "" msgid "New element" msgstr "عنصر جدید" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -11932,7 +11845,7 @@ msgstr "" msgid "New service time" msgstr "زمان سرویس جدید" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -11959,7 +11872,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -11988,30 +11901,6 @@ msgstr "" msgid "No" msgstr "خیر" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12061,11 +11950,6 @@ msgstr "" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12204,17 +12088,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12250,10 +12163,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12281,13 +12193,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12307,8 +12224,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12331,24 +12248,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12370,16 +12287,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12435,7 +12352,7 @@ msgstr "" msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12505,15 +12422,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12847,15 +12764,16 @@ msgstr "خاموش" msgid "Ok" msgstr "صحیح" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12877,10 +12795,6 @@ msgstr "یکبار" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "فقط یکبار" @@ -12890,10 +12804,6 @@ msgstr "فقط یکبار" msgid "One-time downtime" msgstr "یکبار پایین آمده" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "" - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -12941,10 +12851,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -12953,10 +12859,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "" @@ -13005,7 +12907,7 @@ msgstr "" msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13014,33 +12916,33 @@ msgstr "" msgid "Operations" msgstr "عملکردها" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "عملگر" @@ -13449,16 +13351,16 @@ msgstr "" msgid "Parameter" msgstr "پارامتر" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13595,7 +13497,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13641,7 +13543,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13774,7 +13676,7 @@ msgstr "قرار گرفتن در فیلد هاست" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14094,7 +13996,7 @@ msgstr "پروکسی ها" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14102,7 +14004,7 @@ msgstr "پروکسی ها" msgid "Proxy" msgstr "پروکسی" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14112,12 +14014,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "" -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "" @@ -14391,7 +14293,7 @@ msgstr "" msgid "Regular expression" msgstr "عبارت منظم" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14650,7 +14552,7 @@ msgid "Replace dependencies" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14847,7 +14749,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "نتیجه" @@ -15088,7 +14990,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15383,7 +15285,7 @@ msgstr "" msgid "Script" msgstr "اسکریپت" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15496,7 +15398,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15709,11 +15611,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "" -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15725,7 +15627,7 @@ msgstr "" msgid "Service times" msgstr "مدت سرویس" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "نوع سرویس" @@ -15738,7 +15640,7 @@ msgstr "" msgid "Service updated" msgstr "" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15750,7 +15652,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15768,9 +15670,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "جلسه پایان یافت ، لطفاً دوباره وارد شوید" @@ -15832,7 +15734,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16677,10 +16579,10 @@ msgstr "" #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "" @@ -16817,7 +16719,7 @@ msgstr "قالب" msgid "Template \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -16901,7 +16803,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17196,7 +17098,7 @@ msgstr "تا" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17599,7 +17501,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17663,9 +17565,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17675,7 +17577,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17727,7 +17629,7 @@ msgstr "نوع اطلاعات" msgid "Types" msgstr "انواع" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17798,8 +17700,8 @@ msgstr "" msgid "URLs" msgstr "نشانی های اینترنتی" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -17909,21 +17811,23 @@ msgstr "واحدها" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "ناشناخته" @@ -17941,7 +17845,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "" @@ -18079,7 +17983,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18213,37 +18117,37 @@ msgstr "استفاده شده در فعالیت" msgid "User" msgstr "کاربر" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18265,13 +18169,13 @@ msgstr "" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "" #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18294,27 +18198,27 @@ msgstr[0] "" msgid "User group" msgstr "گروه کابر" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "" @@ -18346,9 +18250,9 @@ msgstr[0] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18363,7 +18267,7 @@ msgstr "" msgid "User groups" msgstr "گروه های کابران" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "" @@ -18398,7 +18302,7 @@ msgstr "پروفایل کاربر" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18416,7 +18320,7 @@ msgstr[0] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18465,12 +18369,12 @@ msgstr "" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18781,14 +18685,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -18900,11 +18804,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19439,7 +19344,7 @@ msgstr "سالانه" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19496,7 +19401,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19629,11 +19533,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19641,16 +19545,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19659,37 +19563,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19710,7 +19614,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19718,19 +19622,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19780,7 +19684,7 @@ msgstr "همه" msgid "all media" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19802,23 +19706,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19828,7 +19732,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19836,11 +19740,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20001,13 +19909,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20038,13 +19940,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20062,14 +19964,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20142,7 +20044,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20233,7 +20136,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20255,13 +20158,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20287,7 +20190,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20324,7 +20228,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20415,7 +20319,7 @@ msgstr "نشان" msgid "image" msgstr "تصویر" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20460,15 +20364,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20496,7 +20404,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20525,27 +20433,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20573,7 +20481,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20723,7 +20631,7 @@ msgstr "" msgid "max" msgstr "بیشترین" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20763,7 +20671,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20790,8 +20698,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20812,8 +20720,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21029,6 +20937,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21074,11 +20986,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21090,15 +21002,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21146,7 +21058,7 @@ msgstr "" msgid "short description" msgstr "شرح کوتاه" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21165,15 +21077,15 @@ msgstr "شرح کوتاه" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21189,31 +21101,31 @@ msgstr "نمایش نشان های نگاشت شده" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21221,15 +21133,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21242,7 +21154,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21253,7 +21165,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21262,14 +21174,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21281,20 +21193,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21326,7 +21238,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21334,31 +21246,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21372,7 +21284,7 @@ msgstr "هشدار" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21384,11 +21296,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21397,7 +21309,7 @@ msgstr "" msgid "type here to search" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21445,11 +21357,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21475,8 +21388,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21501,6 +21414,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21558,61 +21475,67 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21643,15 +21566,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21660,7 +21581,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21673,11 +21594,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/fi/LC_MESSAGES/frontend.po b/ui/locale/fi/LC_MESSAGES/frontend.po index 8edfb0e2f1b..a948132cfa4 100644 --- a/ui/locale/fi/LC_MESSAGES/frontend.po +++ b/ui/locale/fi/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2013-10-10 08:23+0300\n" "Last-Translator: richlv <richlv@nakts.net>\n" "Language-Team: none\n" @@ -501,7 +501,7 @@ msgstr "Kuittaa" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Kuitattu" @@ -600,7 +600,7 @@ msgstr "Toiminto \"%1$s\" on jo olemassa." msgid "Action \"%1$s\" no operations defined." msgstr "Toiminnolle \"%1$s\" ei ole määritelty operaatioita." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -726,7 +726,7 @@ msgstr "Aktiivinen asti" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -737,7 +737,7 @@ msgstr "Aktiivinen asti" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -993,7 +993,7 @@ msgstr "Ikä vähemmän kuin" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1316,7 +1316,7 @@ msgstr "klo (tunti:minuutti)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1325,8 +1325,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1337,6 +1337,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1348,7 +1353,7 @@ msgstr "Ainakin yksi ylläpitoikkuna täytyy olla luotuna." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1434,7 +1439,7 @@ msgstr "Tunnistautuminen" msgid "Authentication algorithm" msgstr "Tunnistautumisalgoritmi" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1483,7 +1488,7 @@ msgstr "" msgid "Auto-login" msgstr "Automaattinen sisäänkirjautuminen" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1494,7 +1499,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1753,7 +1758,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1788,7 +1793,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1994,7 +1999,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2116,7 +2121,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "" @@ -2125,7 +2130,7 @@ msgstr "" msgid "Cannot delete action" msgstr "" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2191,7 +2196,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2262,7 +2267,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2285,7 +2290,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "" @@ -2678,16 +2683,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2700,7 +2705,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "" msgstr[1] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "" @@ -2721,7 +2726,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2783,7 +2788,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "" @@ -2866,7 +2871,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "" @@ -2879,7 +2884,7 @@ msgstr "" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2941,8 +2946,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -3002,9 +3008,7 @@ msgstr "" msgid "Cannot update group" msgstr "" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -3087,12 +3091,12 @@ msgstr "" msgid "Cannot update proxy" msgstr "" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3112,9 +3116,9 @@ msgstr "" msgid "Cannot update script" msgstr "" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3297,8 +3301,8 @@ msgid "Character string not included" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3474,7 +3478,7 @@ msgstr "" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3512,13 +3516,13 @@ msgstr "" msgid "Close expression constructor" msgstr "" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3615,7 +3619,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3626,11 +3630,6 @@ msgstr "" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3646,11 +3645,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3842,7 +3836,7 @@ msgstr "" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4044,12 +4038,11 @@ msgstr "" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4076,16 +4069,6 @@ msgid_plural "Correlations enabled" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4096,8 +4079,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "" @@ -4469,7 +4452,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "" @@ -4744,8 +4727,8 @@ msgstr "" msgid "December" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4755,7 +4738,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4852,7 +4835,7 @@ msgstr "" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4902,7 +4885,7 @@ msgstr "" msgid "Delete current action?" msgstr "" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5200,7 +5183,7 @@ msgstr "" msgid "Dependencies" msgstr "" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "" @@ -5208,7 +5191,7 @@ msgstr "" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5417,10 +5400,10 @@ msgstr "" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5503,7 +5486,7 @@ msgid "Discovery by proxy" msgstr "" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "" @@ -5515,7 +5498,7 @@ msgstr "" msgid "Discovery list" msgstr "" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "" @@ -5614,7 +5597,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5625,7 +5608,7 @@ msgstr "" msgid "Discovery rules deleted" msgstr "" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "" @@ -5781,18 +5764,6 @@ msgstr "" msgid "Draw style" msgstr "" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5805,11 +5776,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5969,10 +5935,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -5999,11 +5961,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6188,7 +6148,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6199,7 +6159,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6242,7 +6202,7 @@ msgid "English (en_US)" msgstr "" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6317,7 +6277,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6352,11 +6312,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6692,7 +6652,6 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7060,7 +7019,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7305,12 +7264,12 @@ msgstr "" msgid "Group" msgstr "" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7642,7 +7601,7 @@ msgstr[1] "" msgid "Host \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7650,7 +7609,7 @@ msgstr "" msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7721,17 +7680,17 @@ msgstr[1] "" msgid "Host group" msgstr "" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7745,9 +7704,9 @@ msgid "Host group label type" msgstr "" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7763,8 +7722,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7951,7 +7910,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8039,7 +7998,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "" @@ -8064,7 +8023,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8121,12 +8080,12 @@ msgstr "" msgid "Icon map" msgstr "" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "" @@ -8150,7 +8109,7 @@ msgstr "" msgid "Icon mapping" msgstr "" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8381,7 +8340,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8394,11 +8353,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8610,24 +8569,6 @@ msgstr "" msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "" -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8712,20 +8653,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8790,11 +8722,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8902,7 +8829,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -9016,11 +8943,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9042,10 +8964,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9107,18 +9029,6 @@ msgstr "" msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9180,12 +9090,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9297,7 +9201,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9308,9 +9212,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9461,7 +9365,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "" @@ -9589,7 +9493,7 @@ msgstr "" msgid "Interval" msgstr "" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9612,7 +9516,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9626,7 +9530,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9673,9 +9577,11 @@ msgstr "" #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9715,17 +9621,17 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9733,14 +9639,14 @@ msgstr "" #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9748,111 +9654,116 @@ msgstr "" #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10063,7 +9974,7 @@ msgstr[1] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10242,7 +10153,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10435,7 +10346,7 @@ msgstr "" msgid "Language" msgstr "" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11036,7 +10947,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11278,7 +11189,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11303,7 +11214,7 @@ msgstr "" msgid "Media type" msgstr "" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11347,7 +11258,7 @@ msgstr "" msgid "Media type updated" msgstr "" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11359,7 +11270,7 @@ msgstr "" msgid "Media types" msgstr "" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11606,7 +11517,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12008,15 +11919,17 @@ msgstr "" msgid "New element" msgstr "" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12036,7 +11949,7 @@ msgstr "" msgid "New service time" msgstr "" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12063,7 +11976,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12092,30 +12005,6 @@ msgstr "" msgid "No" msgstr "" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12165,11 +12054,6 @@ msgstr "" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12308,17 +12192,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12354,10 +12267,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12385,13 +12297,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12411,8 +12328,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12435,24 +12352,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12474,16 +12391,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12539,7 +12456,7 @@ msgstr "" msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12609,15 +12526,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12951,15 +12868,16 @@ msgstr "" msgid "Ok" msgstr "" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12981,10 +12899,6 @@ msgstr "" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "" @@ -12994,10 +12908,6 @@ msgstr "" msgid "One-time downtime" msgstr "" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "" - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -13046,10 +12956,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13058,10 +12964,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "" @@ -13110,7 +13012,7 @@ msgstr "" msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13119,33 +13021,33 @@ msgstr "" msgid "Operations" msgstr "" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "" @@ -13554,16 +13456,16 @@ msgstr "" msgid "Parameter" msgstr "" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13700,7 +13602,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13746,7 +13648,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13879,7 +13781,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14199,7 +14101,7 @@ msgstr "" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14207,7 +14109,7 @@ msgstr "" msgid "Proxy" msgstr "" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14217,12 +14119,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "" -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "" @@ -14497,7 +14399,7 @@ msgstr "" msgid "Regular expression" msgstr "" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14757,7 +14659,7 @@ msgid "Replace dependencies" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14954,7 +14856,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "" @@ -15195,7 +15097,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15493,7 +15395,7 @@ msgstr "" msgid "Script" msgstr "" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15607,7 +15509,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15821,11 +15723,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "" -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15837,7 +15739,7 @@ msgstr "" msgid "Service times" msgstr "" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "" @@ -15850,7 +15752,7 @@ msgstr "" msgid "Service updated" msgstr "" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15862,7 +15764,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15880,9 +15782,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "" @@ -15944,7 +15846,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16789,10 +16691,10 @@ msgstr "" #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "" @@ -16929,7 +16831,7 @@ msgstr "" msgid "Template \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17013,7 +16915,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17310,7 +17212,7 @@ msgstr "" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17717,7 +17619,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17781,9 +17683,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17793,7 +17695,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17845,7 +17747,7 @@ msgstr "" msgid "Types" msgstr "" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17916,8 +17818,8 @@ msgstr "" msgid "URLs" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18027,21 +17929,23 @@ msgstr "" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "" @@ -18059,7 +17963,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "" @@ -18198,7 +18102,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18332,37 +18236,37 @@ msgstr "" msgid "User" msgstr "" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18384,13 +18288,13 @@ msgstr "" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "" #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18414,27 +18318,27 @@ msgstr[1] "" msgid "User group" msgstr "" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "" @@ -18468,9 +18372,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18485,7 +18389,7 @@ msgstr "" msgid "User groups" msgstr "" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "" @@ -18520,7 +18424,7 @@ msgstr "" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18539,7 +18443,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18589,12 +18493,12 @@ msgstr "" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18905,14 +18809,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19024,11 +18928,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19565,7 +19470,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19622,7 +19527,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19755,11 +19659,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19767,16 +19671,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19785,37 +19689,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19836,7 +19740,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19844,19 +19748,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19906,7 +19810,7 @@ msgstr "" msgid "all media" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19928,23 +19832,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19954,7 +19858,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19962,11 +19866,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20127,13 +20035,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20164,13 +20066,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20188,14 +20090,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20268,7 +20170,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20359,7 +20262,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20381,13 +20284,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20413,7 +20316,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20450,7 +20354,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20541,7 +20445,7 @@ msgstr "" msgid "image" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20586,15 +20490,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20622,7 +20530,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20651,27 +20559,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20699,7 +20607,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20849,7 +20757,7 @@ msgstr "" msgid "max" msgstr "" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20889,7 +20797,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20916,8 +20824,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20938,8 +20846,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21155,6 +21063,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21200,11 +21112,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21216,15 +21128,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21272,7 +21184,7 @@ msgstr "" msgid "short description" msgstr "lyhyt kuvaus" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21291,15 +21203,15 @@ msgstr "lyhyt kuvaus" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21315,31 +21227,31 @@ msgstr "näytä ikoni" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21347,15 +21259,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21368,7 +21280,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21379,7 +21291,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21388,14 +21300,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21407,20 +21319,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21452,7 +21364,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21460,31 +21372,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21498,7 +21410,7 @@ msgstr "" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21510,11 +21422,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21523,7 +21435,7 @@ msgstr "" msgid "type here to search" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21571,11 +21483,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21601,8 +21514,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21627,6 +21540,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21684,61 +21601,69 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21769,15 +21694,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21786,7 +21709,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21799,11 +21722,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/fr/LC_MESSAGES/frontend.po b/ui/locale/fr/LC_MESSAGES/frontend.po index f7cd12c072b..f60def6719d 100644 --- a/ui/locale/fr/LC_MESSAGES/frontend.po +++ b/ui/locale/fr/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2018-01-15 09:21+0300\n" "Last-Translator: Christophe <ctr@pmspos.fr>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -500,7 +500,7 @@ msgstr "Acquittement" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Acquitté" @@ -599,7 +599,7 @@ msgstr "Action \"%1$s\" déjà existante." msgid "Action \"%1$s\" no operations defined." msgstr "Aucune opération définie pour l'action \"%1$s\"." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -725,7 +725,7 @@ msgstr "Actif jusqu'à" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -736,7 +736,7 @@ msgstr "Actif jusqu'à" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -992,7 +992,7 @@ msgstr "Âge inférieur à" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1316,7 +1316,7 @@ msgstr "À (heure:minute)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1325,8 +1325,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1337,6 +1337,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "Au moins un groupe hôte ou un hôte doit être sélectionné." +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1348,7 +1353,7 @@ msgstr "Au moins une période de maintenance doit être créée." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1434,7 +1439,7 @@ msgstr "Authentification" msgid "Authentication algorithm" msgstr "Algorithme d'authentification" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "L'authentification a échoué: %1$s." @@ -1483,7 +1488,7 @@ msgstr "Auto" msgid "Auto-login" msgstr "Connexion automatique" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Les options d'auto-connexion et d'auto-déconnexion ne peuvent pas être activées en même temps." @@ -1494,7 +1499,7 @@ msgstr "Auto-déconnexion" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1753,7 +1758,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1788,7 +1793,7 @@ msgstr "Rappel" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1994,7 +1999,7 @@ msgstr "Impossible d'établir une liaison avec le serveur LDAP." msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2116,7 +2121,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Impossible de supprimer l'utilisateur interne Zabbix \"%1$s\", essayez de désactiver cet utilisateur." @@ -2125,7 +2130,7 @@ msgstr "Impossible de supprimer l'utilisateur interne Zabbix \"%1$s\", essayez d msgid "Cannot delete action" msgstr "Impossible de supprimer l'action" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2193,7 +2198,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "Impossible de supprimer l'hôte car la maintenance \"%1$s\" doit contenir au moins un hôte ou un groupe d'hôtes." msgstr[1] "Impossible de supprimer les hôtes sélectionnés car la maintenance \"%1$s\" doit contenir au moins un hôte ou un groupe d'hôtes." -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2264,7 +2269,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "Impossible de supprimer le proxy" msgstr[1] "Impossible de supprimer les proxy" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2287,7 +2292,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "Impossible de supprimer le script" msgstr[1] "Impossible de supprimer les scripts" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Impossible de supprimer les scripts. Le script \"%1$s\" est utilisé dans l'opération de l'action \"%2$s\"." @@ -2681,16 +2686,16 @@ msgstr "Impossible de trouver la table de correspondances \"%1$s\" utilisée pou msgid "Cannot have empty visible template name." msgstr "Le nom visible du modèle ne peut pas être vide." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2703,7 +2708,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "Impossible d'importer le modèle \"%1$s\", le modèle lié \"%2$s\" n'existe pas." msgstr[1] "Impossible d'importer le modèle \"%1$s\", les modèles liés \"%2$s\" n'existent pas." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Impossible d'insérer l'expression de déclencheur" @@ -2724,7 +2729,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2786,7 +2791,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Impossible de lire la réponse, veuillez vérifier la connexion avec le serveur Zabbix \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Impossible de renommer l'utilisateur invité." @@ -2869,7 +2874,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Impossible de délier et effacer les scénarios web." @@ -2882,7 +2887,7 @@ msgstr "Impossible de délier le modèle" msgid "Cannot unlink template." msgstr "Impossible de délier le modèle." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2944,9 +2949,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Impossible de mettre à jour un graphique découvert." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Impossible de mettre à jour un groupe d'hôtes découvert." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3005,9 +3011,7 @@ msgstr "Impossible de mettre à jour le prototype de graphique" msgid "Cannot update group" msgstr "Impossible de mettre à jour le groupe" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Impossible de mettre à jour les groupes pour l'hôte découvert \"%1$s\"." @@ -3090,12 +3094,12 @@ msgstr "Impossible de mettre à jour la carte" msgid "Cannot update proxy" msgstr "Impossible de mettre à jour le proxy" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Impossible de mettre à jour le proxy pour l'hôte découvert \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3115,9 +3119,9 @@ msgstr "" msgid "Cannot update script" msgstr "Impossible de mettre à jour le script" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3300,8 +3304,8 @@ msgid "Character string not included" msgstr "Chaîne de caractères non inclue" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3477,7 +3481,7 @@ msgstr "Horloge" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3515,13 +3519,13 @@ msgstr "Fermer" msgid "Close expression constructor" msgstr "Fermer le constructeur d'expression" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Fermer le nouvel événement" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Fermer les anciens événements" @@ -3618,7 +3622,7 @@ msgstr "Compression" msgid "Concurrent sessions" msgstr "Sessions concurrentes" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3629,11 +3633,6 @@ msgstr "Condition" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "La condition \"%2$s\" n'est pas utilisée dans la formule \"%3$s\" pour l'action \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "La condition \"%2$s\" n'est pas utilisée dans la formule \"%3$s\" pour la corrélation \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3649,11 +3648,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "La condition \"%2$s\" utilisée dans la formule \"%3$s\" pour l'action \"%1$s\" n'est pas définie." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "La condition \"%2$s\" utilisée dans la formule \"%3$s\" pour la corrélation \"%1$s\" n'est pas définie." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3845,7 +3839,7 @@ msgstr "Texte de confirmation" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Félicitations ! Vous avez installé l'interface Zabbix avec succès." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4047,12 +4041,11 @@ msgstr "Copier" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Corrélation" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "La corrélation \"%1$s\" existe déjà." @@ -4080,16 +4073,6 @@ msgid_plural "Correlations enabled" msgstr[0] "Corrélation activée" msgstr[1] "Corrélations activées" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "Paramètre manquant pour la corrélation : %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "Le nom de la corrélation ne peut pas être vide." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Règle de corrélation" @@ -4100,8 +4083,8 @@ msgstr "Corrélation mise à jour" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Compte" @@ -4473,7 +4456,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "Nom DNS" @@ -4748,8 +4731,8 @@ msgstr "Déc" msgid "December" msgstr "Décembre" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4759,7 +4742,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4856,7 +4839,7 @@ msgstr "Retardé de" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4906,7 +4889,7 @@ msgstr "Supprimer et nettoyer le modèle ? (Attention : tous les hôtes liés se msgid "Delete current action?" msgstr "Effacer l'action actuelle ?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Effacer la corrélation actuelle ?" @@ -5204,7 +5187,7 @@ msgstr "" msgid "Dependencies" msgstr "Dépendances" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Dépendant" @@ -5212,7 +5195,7 @@ msgstr "Dépendant" msgid "Dependent item" msgstr "Élément dépendant" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5421,10 +5404,10 @@ msgstr "Désactiver les scénarios web sélectionnés ?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5507,7 +5490,7 @@ msgid "Discovery by proxy" msgstr "Découverte par le proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Test de découverte" @@ -5519,7 +5502,7 @@ msgstr "Tests de découverte" msgid "Discovery list" msgstr "Liste des découvertes" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Objet de découverte" @@ -5619,7 +5602,7 @@ msgstr "Règle de découverte mise à jour" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5630,7 +5613,7 @@ msgstr "Règles de découverte" msgid "Discovery rules deleted" msgstr "Règles de découverte supprimées" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "État de la découverte" @@ -5786,18 +5769,6 @@ msgstr "Dessiner" msgid "Draw style" msgstr "Style de dessin" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "Valeur \"%1$s\" \"%2$s\" dupliquée pour la corrélation \"%3$s\"." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Valeur \"%1$s\" \"%2$s\" dupliquée pour la corrélation." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5810,11 +5781,6 @@ msgstr "Valeur \"name\" \"%1$s\" en doublon pour la carte." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5974,10 +5940,6 @@ msgstr "Clé SSL vide pour le scénario web \"%1$s\"." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "Identifiant de corrélation vide." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6004,11 +5966,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "Type de condition de filtre vide pour l'action \"%1$s\"." #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6193,7 +6153,7 @@ msgstr "Activer les trap" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6204,7 +6164,7 @@ msgstr "Activer les trap" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6247,7 +6207,7 @@ msgid "English (en_US)" msgstr "Anglais (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6322,7 +6282,7 @@ msgid "Event correlation" msgstr "Corrélation d'événement" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Règles de corrélation d'événement" @@ -6357,11 +6317,11 @@ msgstr "Supervision du journal d'événements. Retourne un journal" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Paire de tags d'événement" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Type d'événement" @@ -6697,7 +6657,6 @@ msgstr "Le champ \"%1$s\" ne peut pas être configuré à NULL." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7065,7 +7024,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "L'expression fournie n'est pas une macro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "L'expression régulière globale \"%1$s\" n'existe pas." @@ -7310,12 +7269,12 @@ msgstr "Grille" msgid "Group" msgstr "Groupe" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Le groupe \"%1$s\" ne peut pas être effacé, car il est utilisé par un prototype d'hôte." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "Le groupe \"%1$s\" ne peut pas être effacé, car il est utilisé dans une condition de corrélation." @@ -7647,7 +7606,7 @@ msgstr[1] "Hôtes" msgid "Host \"%1$s\" already exists." msgstr "L'hôte \"%1$s\" existe déjà." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7655,7 +7614,7 @@ msgstr "L'hôte \"%1$s\" existe déjà." msgid "Host \"%1$s\" cannot be without host group." msgstr "L'hôte \"%1$s\" ne peut pas ne pas avoir de groupe d'hôte." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7726,17 +7685,17 @@ msgstr[1] "Hôtes désactivés" msgid "Host group" msgstr "Groupe d'hôtes" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Le groupe d'hôtes \"%1$s\" existe déjà." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Le groupe d'hôtes \"%1$s\" ne peut pas être effacé, car il est utilisé dans un script global." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7750,9 +7709,9 @@ msgid "Host group label type" msgstr "Type d'étiquette du groupe d'hôtes" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "Le groupe d'hôtes avec l'ID \"%1$s\" n'est pas disponible." @@ -7768,8 +7727,8 @@ msgstr "Le groupe d'hôtes avec l'ID \"%1$s\" n'est pas disponible." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7956,7 +7915,7 @@ msgstr "Un hôte ayant le même nom visible \"%1$s\" existe déjà." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8044,7 +8003,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "adresse IP" @@ -8069,7 +8028,7 @@ msgstr "La plage d'IP \"%1$s\" dépasse la limite d'adresses \"%2$s\"" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8126,12 +8085,12 @@ msgstr "Icône surlignée" msgid "Icon map" msgstr "Correspondance d'icône" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "La correspondance d'icône \"%1$s\" ne peut pas être supprimée. Utilisée dans la carte \"%2$s\"." @@ -8155,7 +8114,7 @@ msgstr "Correspondance d'icône mise à jour" msgid "Icon mapping" msgstr "Correspondance d'icônes" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "L'icône avec l'IS \"%1$s\" n'est pas disponible." @@ -8386,7 +8345,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8399,11 +8358,11 @@ msgstr "Carte inaccessible" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "Modèle inaccessible" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "Déclencheur inaccessible" @@ -8615,24 +8574,6 @@ msgstr "Groupe d'utilisateurs associé à l'action incorrect. Le groupe d'utilis msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Utilisateur associé à l'action incorrect. L'utilisateur n'existe pas ou vous n'y avez pas accès." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8717,20 +8658,11 @@ msgstr "Conditions incorrectes pour l'action \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Conditions incorrectes pour la règle de découverte \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "Identifiant de corrélation incorrect." - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "Expression personnalisée \"%2$s\" incorrecte pour l'action \"%1$s\" : %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "Expression personnalisée \"%2$s\" incorrecte pour la corrélation \"%1$s\": %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8795,11 +8727,6 @@ msgstr "Identifiant de formule de condition de filtre incorrect pour l'action \" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Identifiant de formule de condition de filtre incorrect pour la règle de découverte \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "Identifiant de formule de condition de filtre incorrect pour la corrélation \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8907,7 +8834,7 @@ msgstr "Identifiant de carte incorrect." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Méthode \"%1$s.%2$s\" incorrecte." @@ -9021,11 +8948,6 @@ msgstr "Expression du prototype de déclencheur incorrecte. Les éléments de l' msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Type de calcul incorrect pour l'action \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "Type de calcul incorrect pour la corrélation \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9047,10 +8969,10 @@ msgstr "Identifiant d'utilisateur incorrect pour la carte \"%1$s\"." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "Identifiant de groupe d'utilisateurs incorrect pour la carte \"%1$s\"." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9112,18 +9034,6 @@ msgstr "Valeur incorrecte \"%1$s\" pour le champ d'entier \"%2$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Valeur incorrecte \"%1$s\" pour le champ d'entier non signé \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "Valeur incorrecte \"%1$s\" dans le champ \"%2$s\" pour la corrélation \"%3$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9185,12 +9095,6 @@ msgstr "Valeur incorrecte pour le champ \"%1$s\"." #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9302,7 +9206,7 @@ msgstr "Valeur incorrecte pour le champ \"%1$s\"." #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9313,9 +9217,9 @@ msgstr "Valeur incorrecte pour le champ \"%1$s\"." #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9466,7 +9370,7 @@ msgstr "Tags hérités et déclencheurs" msgid "Inherited items" msgstr "Éléments hérités " -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Insertion" @@ -9594,7 +9498,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Intervalle" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9617,7 +9521,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "Condition d'action invalide: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9631,7 +9535,7 @@ msgstr "Data invalide." msgid "Invalid email address \"%1$s\"." msgstr "Adresse de courrier électronique non valide \"%1$s\"." -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "Adresse e-mail incorrecte pour le type de media avec l'ID \"%1$s\"." @@ -9678,9 +9582,11 @@ msgstr "Paramètres de la méthode invalides." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9720,17 +9626,17 @@ msgstr "Paramètres de la méthode invalides." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9738,14 +9644,14 @@ msgstr "Paramètres de la méthode invalides." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9753,111 +9659,116 @@ msgstr "Paramètres de la méthode invalides." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10068,7 +9979,7 @@ msgstr[1] "Éléments activés" msgid "Item in \"not supported\" state" msgstr "Élément dans l'état \"non supporté\"" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Élément non sélectionné" @@ -10247,7 +10158,7 @@ msgstr "Éléments modifiés" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10440,7 +10351,7 @@ msgstr "Positionnement de l'étiquette" msgid "Language" msgstr "Langue" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11041,7 +10952,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11283,7 +11194,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "La période maximale à afficher est %1$s jour." msgstr[1] "La période maximale à afficher est %1$s jours." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "Longueur totale maximale de l'adresse e-mail dépassée pour le type de media avec l'ID \"%1$s\"." @@ -11308,7 +11219,7 @@ msgstr "Média" msgid "Media type" msgstr "Type de média" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Le type de média \"%1$s\" existe déjà." @@ -11352,7 +11263,7 @@ msgstr "Test du type de média réussi." msgid "Media type updated" msgstr "Type de média mis à jour" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "Le type de média avec l'IS \"%1$s\" n'est pas disponible." @@ -11364,7 +11275,7 @@ msgstr "Le type de média avec l'IS \"%1$s\" n'est pas disponible." msgid "Media types" msgstr "Types de média" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11611,7 +11522,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12013,15 +11924,17 @@ msgstr "Nouveau tableau de bord" msgid "New element" msgstr "Nouvel élément" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "Nouveau groupe d'hôte d'événement" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Nouvelle valeur de tag d'événement" @@ -12041,7 +11954,7 @@ msgstr "" msgid "New service time" msgstr "Nouvelle période de maintenance" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12068,7 +11981,7 @@ msgstr "Prochaine étape" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12097,30 +12010,6 @@ msgstr "Prochaine étape" msgid "No" msgstr "Non" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "Aucun \"%1$s\" donné pour la corrélation \"%2$s\"." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "Pas de \"%1$s\" donné pour la corrélation." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12170,11 +12059,6 @@ msgstr "Aucun nom d'utilisateur d'authentification spécifié." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "Aucun type de condition donné pour la corrélation \"%1$s\"." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12313,17 +12197,46 @@ msgstr "Aucune correspondance trouvée" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "Aucun type d'opération donné pour la corrélation \"%1$s\"." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Aucune permission pour l'accès au système." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12359,10 +12272,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12390,13 +12302,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12416,8 +12333,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12440,24 +12357,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12479,16 +12396,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12544,7 +12461,7 @@ msgstr "Aucun déclencheur défini." msgid "No value" msgstr "Pas de valeur" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Les drapeaux non-booléens sont obsolètes." @@ -12614,15 +12531,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Configuration du mot de passe de l'utilisateur \"guest\" interdite." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12956,15 +12873,16 @@ msgstr "Inactif" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Ancienne valeur du tag d'événement" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12986,10 +12904,6 @@ msgstr "Une fois" msgid "One" msgstr "Un" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Un des objets reste sans groupe d'hôtes." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Une fois uniquement" @@ -12999,10 +12913,6 @@ msgstr "Une fois uniquement" msgid "One-time downtime" msgstr "Temps d'arrêt unique" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Seuls les super administrateurs peuvent créer des groupes d'hôtes." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Seules les vérifications d'agents Zabbix, SNMPv1, SNMPv2 et SNMPv3 peuvent être mises uniques." @@ -13051,10 +12961,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Seuls les super administateurs peuvent créer des corrélations." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "Seul les super-admin peuvent spécifier le propriétaire d'un tableau de bord." @@ -13063,10 +12969,6 @@ msgstr "Seul les super-admin peuvent spécifier le propriétaire d'un tableau de msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Seuls les super administrateurs peuvent mettre à jour les corrélations." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Seuls les déclencheurs assignés à des hôtes activés et dépendant d'éléments activés sont comptés" @@ -13115,7 +13017,7 @@ msgstr "L'opération n'a pas de modèle à exploiter." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13124,33 +13026,33 @@ msgstr "" msgid "Operations" msgstr "Opérations" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Opérateur" @@ -13559,16 +13461,16 @@ msgstr "" msgid "Parameter" msgstr "Paramètre" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Le paramètre \"%1$s\" est obsolète." @@ -13705,7 +13607,7 @@ msgstr "" msgid "Paste without external links" msgstr "Coller sans les liens externes" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13751,7 +13653,7 @@ msgstr "Réalise une requête DNS. Retourne une chaîne de caractères avec le t #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13884,7 +13786,7 @@ msgstr "Remplit le champ d'inventaire d'hôte" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14204,7 +14106,7 @@ msgstr "Proxys" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14212,7 +14114,7 @@ msgstr "Proxys" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14222,12 +14124,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Le proxy \"%1$s\" pour l'hôte \"%2$s\" n'existe pas." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "Le proxy \"%1$s\" est utilisé par l'action \"%2$s\"." -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Le proxy \"%1$s\" est utilisé par la règle de découverte \"%2$s\"." @@ -14502,7 +14404,7 @@ msgstr "Normal" msgid "Regular expression" msgstr "Expression régulière" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14762,7 +14664,7 @@ msgid "Replace dependencies" msgstr "Remplacer les dépendances" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14959,7 +14861,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Résultat" @@ -15200,7 +15102,7 @@ msgstr "Port du serveur SMTP" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15498,7 +15400,7 @@ msgstr "Étendue" msgid "Script" msgstr "Script" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Le script \"%1$s\" existe déjà." @@ -15612,7 +15514,7 @@ msgid "Security name" msgstr "Nom de la sécurité" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15827,11 +15729,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "L'heure de démarrage du service doit être antérieure à l'heure de fin." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15843,7 +15745,7 @@ msgstr "" msgid "Service times" msgstr "Périodes de maintenance" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Type de service" @@ -15856,7 +15758,7 @@ msgstr "" msgid "Service updated" msgstr "Service mis à jour" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15868,7 +15770,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15886,9 +15788,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Session terminée, veuillez vous reconnecter." @@ -15950,7 +15852,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16795,10 +16697,10 @@ msgstr "La table \"%1$s\" n'a pas de champ nommé \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Étiquette" @@ -16935,7 +16837,7 @@ msgstr "Modèle" msgid "Template \"%1$s\" already exists." msgstr "Le modèle \"%1$s\" existe déjà." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17019,7 +16921,7 @@ msgstr "Un modèle avec le même nom visible \"%1$s\" existe déjà." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17316,7 +17218,7 @@ msgstr "À" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17723,7 +17625,7 @@ msgstr "Déclencheur mis à jour" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17787,9 +17689,9 @@ msgstr "Deux éléments de carte devraient être sélectionnés" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17799,7 +17701,7 @@ msgstr "Deux éléments de carte devraient être sélectionnés" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17851,7 +17753,7 @@ msgstr "Type d'information" msgid "Types" msgstr "Types" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17922,8 +17824,8 @@ msgstr "Les URLS doivent avoir les champs \"name\" et \"url\" pour la carte \"%1 msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18033,21 +17935,23 @@ msgstr "Unités" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Inconnu" @@ -18065,7 +17969,7 @@ msgid "Unknown error" msgstr "Erreur inconnue" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Élément inconnu, cet élément n'existe pas dans l'hôte sélectionné" @@ -18204,7 +18108,7 @@ msgstr "Fonctionne" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18338,37 +18242,37 @@ msgstr "Utilisé dans les actions" msgid "User" msgstr "Utilisateur" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "L'utilisateur \"%1$s\" ne peut pas ne pas avoir de groupe d'utilisateurs." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "L'utilisateur \"%1$s\" est le propriétaire du tableau de bord \"%2$s\"." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "L'utilisateur \"%1$s\" est le propriétaire de la carte \"%2$s\"." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "L'utilisateur \"%1$s\" est utilisé dans l'action \"%2$s\"." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18390,13 +18294,13 @@ msgstr "Utilisateur ajouté" msgid "User agent string" msgstr "Chaîne du \"user agent\"" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Un utilisateur ne peut pas s'ajouter à un groupe désactivé ou à un groupe sans accès GUI." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18420,27 +18324,27 @@ msgstr[1] "" msgid "User group" msgstr "Groupe d'utilisateurs" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Le groupe d'utilisateurs \"%1$s\" existe déjà." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "Le groupe d'utilisateurs \"%1$s\" est utilisé dans l'action \"%2$s\"." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Le groupe d'utilisateurs \"%1$s\" est utilisé dans la configuration pour les messages envoyés lorsque la base de données est arrêtée." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Le groupe d'utilisateurs \"%1$s\" est utilisé dans le script \"%2$s\"." @@ -18474,9 +18378,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "Le groupe d'utilisateurs avec l'IS \"%1$s\" n'est pas disponible." @@ -18491,7 +18395,7 @@ msgstr "Le groupe d'utilisateurs avec l'IS \"%1$s\" n'est pas disponible." msgid "User groups" msgstr "Groupes d'utilisateurs" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Un utilisateur n'est pas autorisé à s'effacer lui-même." @@ -18526,7 +18430,7 @@ msgstr "Profil utilisateur" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18545,7 +18449,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18595,12 +18499,12 @@ msgstr "Utilisateur mis à jour" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "L'utilisateur avec l'ID \"%1$s\" n'est pas disponible." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18911,14 +18815,14 @@ msgstr "Validation" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19030,11 +18934,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Valeur de n'importe quel compteur de performances Windows. Retourne un entier, un flottant une chaîne ou un texte (selon la requête)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19571,7 +19476,7 @@ msgstr "Annuel" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19628,7 +19533,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19761,11 +19665,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "un booléen est nécessaire" @@ -19773,16 +19677,16 @@ msgstr "un booléen est nécessaire" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "une chaîne de caractères est attendue" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19791,37 +19695,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "une macro de découverte de bas niveau est attendue" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "un nombre est nécessaire" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "un nombre est trop grand" @@ -19842,7 +19746,7 @@ msgstr "une durée relative est attendue" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19850,19 +19754,19 @@ msgstr "" msgid "a time is expected" msgstr "un temps est attendu" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "une période de temps est nécessaire" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: include/validate.inc.php:221 msgid "a time range is expected" msgstr "une plage de temps est nécessaire" #: app/controllers/CControllerPopupHttpStep.php:94 #: app/controllers/CControllerPopupLldOperation.php:154 -#: include/classes/validators/CApiInputValidator.php:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19912,7 +19816,7 @@ msgstr "tous" msgid "all media" msgstr "tous les médias" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19934,23 +19838,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "un tableau est attendu" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "un tableau ou une chaîne de caractères est attendu" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19960,7 +19864,7 @@ msgid "an empty string is expected" msgstr "une chaîne vie est attendue" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "un nombre pair de caractères hexadécimaux est nécessaire" @@ -19968,11 +19872,15 @@ msgstr "un nombre pair de caractères hexadécimaux est nécessaire" msgid "an explicit time is expected" msgstr "un temps explicite est attendu" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20133,13 +20041,7 @@ msgstr "ne peut pas être changé" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20170,13 +20072,13 @@ msgstr "ne peut pas être changé" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20194,14 +20096,14 @@ msgstr "ne peut pas être changé" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20274,7 +20176,8 @@ msgid "configure" msgstr "configurer" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "contient" @@ -20365,7 +20268,7 @@ msgstr "décroissant" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20387,13 +20290,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "ne contient pas" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "n'est pas égal" @@ -20419,7 +20322,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20456,7 +20360,7 @@ msgstr "l'expression est vide" msgid "failed to parse JSON" msgstr "impossible de parcourir le JSON" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20547,7 +20451,7 @@ msgstr "icône" msgid "image" msgstr "image" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20592,15 +20496,19 @@ msgstr "compte d'éléments incorrect" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "syntaxe incorrecte à proximité de \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20628,7 +20536,7 @@ msgstr "motif Prometheus invalide" msgid "invalid address range \"%1$s\"" msgstr "plage d'adresses \"%1$s\" invalide" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "séquence d'octets invalide en UTF-8" @@ -20657,27 +20565,27 @@ msgstr "" msgid "invalid history storage period" msgstr "période de stockage de l'historique invalide" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "nom de groupe d'hôte non valide" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "nom d'hôte invalide" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "expression régulière invalide" @@ -20705,7 +20613,7 @@ msgstr "est supérieur ou égal à" msgid "is less than or equals" msgstr "est inférieur ou égal à" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "n'est pas entouré de {} ou est malformé" @@ -20855,7 +20763,7 @@ msgstr "correspond à" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20895,7 +20803,7 @@ msgid "min() - Minimum value for period T" msgstr "min () - Valeur minimale pour la période T" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "la longueur minimale est de %1$s caractères" @@ -20922,8 +20830,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20944,8 +20852,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "doit contenir au moins une macro de découverte de bas niveau" @@ -21161,6 +21069,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21206,11 +21118,11 @@ msgstr "" msgid "regular expression" msgstr "expression régulière" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21222,15 +21134,15 @@ msgstr "" msgid "right" msgstr "droite" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21278,7 +21190,7 @@ msgstr "" msgid "short description" msgstr "description courte" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21297,15 +21209,15 @@ msgstr "description courte" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "doit être vide" @@ -21321,31 +21233,31 @@ msgstr "afficher les correspondances d'icônes" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21353,15 +21265,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "sum () - Somme des valeurs d'une période T" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "les informations d'identification fournies ne sont pas uniques" @@ -21374,7 +21286,7 @@ msgstr "les informations d'identification fournies ne sont pas uniques" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21385,7 +21297,7 @@ msgstr "les informations d'identification fournies ne sont pas uniques" msgid "tag" msgstr "tag" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21394,14 +21306,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "ID du modèle \"%1$s\" passé %2$s fois" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21413,20 +21325,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "le paramètre \"%1$s\" est manquant" @@ -21458,7 +21370,7 @@ msgstr "troisième" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21466,31 +21378,31 @@ msgstr "" msgid "time shift" msgstr "décalage horaire" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "time () - Heure actuelle" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft () - Temps nécessaire pour atteindre le seuil estimé en fonction de la période T" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21504,7 +21416,7 @@ msgstr "déclencheur" msgid "trigger does not allow manual closing" msgstr "le déclencheur ne permet pas une fermeture manuelle" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21516,11 +21428,11 @@ msgstr "un prototype de déclencheur ne peut pas être déplacé vers un autre m msgid "trigger with linkages cannot be moved to another template or host" msgstr "un déclencheur avec liens ne peut pas être déplacé vers un autre modèle ou hôte" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21529,7 +21441,7 @@ msgstr "" msgid "type here to search" msgstr "taper ici pour rechercher" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21577,11 +21489,12 @@ msgstr "fin de macro inattendue" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "paramètre inattendu \"%1$s\"" @@ -21607,8 +21520,8 @@ msgstr "texte \"%1$s\" inattendu" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21633,6 +21546,10 @@ msgstr "suffixe de temps non supporté" msgid "unsupported version number" msgstr "numéro de version non supporté" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21690,61 +21607,69 @@ msgstr "valeur \"%1$s\" non trouvée" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "la valeur %1$s existe déjà" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "la valeur est trop longue" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21775,15 +21700,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "la valeur doit être l'un de %1$s" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21792,7 +21715,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21805,11 +21728,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/he/LC_MESSAGES/frontend.po b/ui/locale/he/LC_MESSAGES/frontend.po index 76232072ac9..b2cfb031ff9 100644 --- a/ui/locale/he/LC_MESSAGES/frontend.po +++ b/ui/locale/he/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2021-10-05 11:56+0300\n" "Last-Translator: Yaron <sh.yaron@gmail.com>\n" "Language-Team: none\n" @@ -499,7 +499,7 @@ msgstr "הכרה" msgid "Acknowledge problems" msgstr "הכרה בתקלות" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "מוכר" @@ -598,7 +598,7 @@ msgstr "המשימה „%1$s” כבר קיימת." msgid "Action \"%1$s\" no operations defined." msgstr "למשימה „%1$s” לא הוגדרו פעולות." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "המשימה „%2$s” אינה זמינה לתפקיד משתמש „%1$s”." @@ -724,7 +724,7 @@ msgstr "פעיל עד" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -735,7 +735,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -991,7 +991,7 @@ msgstr "הגיל קטן מ־" msgid "Age less than %1$s" msgstr "הגיל קטן מ־%1$s" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1315,7 +1315,7 @@ msgstr "בשעה (שעה:דקה)" msgid "At least one UI element must be checked." msgstr "יש לסמן לפחות רכיב מנשק משתמש אחד." -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "יש להפעיל לפחות רכיב מנשק משתמש אחד לתפקיד המשתמש „%1$s”." @@ -1324,8 +1324,8 @@ msgstr "יש להפעיל לפחות רכיב מנשק משתמש אחד לתפ msgid "At least one action is mandatory." msgstr "חובה לפחות פעולה אחת." -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "לפחות משתמש פעיל אחד חייב להיות קיים עם התפקיד „%1$s”." @@ -1336,6 +1336,11 @@ msgstr "לפחות משתמש פעיל אחד חייב להיות קיים עם msgid "At least one host group or host must be selected." msgstr "חובה לבחור לפחות קבוצת מארחים אחת." +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1347,7 +1352,7 @@ msgstr "יש ליצור תקופת תחזוקה אחת לפחות." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "אמורה להיות תמיכה באחד לפחות מבין MySQL, PostgreSQL או Oracle." -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "יש לבחור בפעילות אחת לפחות." @@ -1433,7 +1438,7 @@ msgstr "אימות" msgid "Authentication algorithm" msgstr "אלגוריתם אימות" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "האימות נכשל: %1$s." @@ -1482,7 +1487,7 @@ msgstr "אוטומטית" msgid "Auto-login" msgstr "כניסה אוטומטית" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "לא ניתן להפעיל את האפשרויות לכניסה וליציאה באופן אוטומטי יחדיו." @@ -1493,7 +1498,7 @@ msgstr "יציאה אוטומטית" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1752,7 +1757,7 @@ msgstr "CRLF" msgid "CSV to JSON" msgstr "CSV ל־JSON" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "אמור להיות CUID" @@ -1787,7 +1792,7 @@ msgstr "קריאה" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1993,7 +1998,7 @@ msgstr "לא ניתן להתאגד אל שרת ה־LDAP." msgid "Cannot build expression tree: %1$s." msgstr "לא ניתן לבנות עץ ביטויים: %1$s." -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "אי אפשר לשנות את סוג המשתמש של תפקיד עצמי." @@ -2115,7 +2120,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "לא ניתן למחוק אסימון API" msgstr[1] "לא ניתן למחוק אסימוני API" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "לא ניתן למחוק את המשתמש הפנימי של Zabbix בשם „%1$s”, יש לנסות להשבית את המשתמש הזה." @@ -2124,7 +2129,7 @@ msgstr "לא ניתן למחוק את המשתמש הפנימי של Zabbix בש msgid "Cannot delete action" msgstr "לא ניתן למחוק את המשימה" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "לא ניתן למחוק את תפקיד המשתמש המוקצה „%1$s”." @@ -2190,7 +2195,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "לא ניתן למחוק את המארח כיוון שעל משימת התחזוקה „%1$s” להכיל מארח אחד ומעלה או קבוצת מארחים אחת ומעלה." msgstr[1] "לא ניתן למחוק את המארחים הנבחרים כיוון שעל משימת התחזוקה „%1$s” להכיל מארח אחד ומעלה או קבוצת מארחים אחת ומעלה." -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2261,7 +2266,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "לא ניתן למחוק מתווך" msgstr[1] "לא ניתן למחוק מתווכים" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "לא ניתן למחוק תפקיד משתמש לקריאה בלבד „%1$s”." @@ -2284,7 +2289,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "לא ניתן למחוק סקריפט" msgstr[1] "לא ניתן למחוק סקריפטים" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "לא ניתן למחוק את הסקריפטים. בסקריפט „%1$s” נעשה שימוש במשימת הפעולה „%2$s”." @@ -2677,16 +2682,16 @@ msgstr "לא ניתן למצוא את מפת הערכים „%1$s” שמשמש msgid "Cannot have empty visible template name." msgstr "שם התצוגה של התבנית לא יכול להיות ריק." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "לא יכול להיות כלל „%2$s” שחורג מבררת המחדל בזמן ש־„%3$s” מוגדר לכדי %4$d לתפקיד המשתמש „%1$s”." -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "לא יכול להיות ערך תגית שאינו ריק כשיש תגית ריקה בכלל „%2$s” לתפקיד המשתמש „%1$s”." @@ -2699,7 +2704,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "לא ניתן לייבא את התבנית „%1$s”, התבנית המקושרת „%2$s” אינה קיימת." msgstr[1] "לא ניתן לייבא את התבנית „%1$s”, התבניות המקושרות „%2$s” אינן קיימות." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "לא ניתן להוסיף ביטוי הקפצה" @@ -2720,7 +2725,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "לא ניתן לטעון את המודול תחת: %1$s." msgstr[1] "לא ניתן לטעון את המודולים תחת: %1$s." -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "לא ניתן לצאת." @@ -2782,7 +2787,7 @@ msgstr "לא ניתן לקרוא YAML: %1$s." msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "לא ניתן לקרוא את התגובה, יש לבדוק את החיבור לשרת ה־Zabbix „%1$s”." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "לא ניתן לשנות את שם משתמש האורח." @@ -2865,7 +2870,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "לא ניתן לשחרר חסימת משתמש" msgstr[1] "לא ניתן לשחרר חסימות משתמשים" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "לא ניתן לנתק ולפנות תרחישי רשת." @@ -2878,7 +2883,7 @@ msgstr "לא ניתן לנתק ולפנות תבנית" msgid "Cannot unlink template." msgstr "לא ניתן לנתק ולפנות תבנית." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "לא ניתן לנתק את ההקפצה „%1$s”, יש לה פריטים מתבנית שנותרה מקושרת למארח." @@ -2940,9 +2945,10 @@ msgstr "לא ניתן לעדכן אסימון API" msgid "Cannot update a discovered graph." msgstr "לא ניתן לעדכן את התרשים שהתגלה." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "לא ניתן לעדכן קבוצת מארחים שהתגלתה." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3001,9 +3007,7 @@ msgstr "לא ניתן לעדכן את האבטיפוס של התרשים" msgid "Cannot update group" msgstr "לא ניתן לעדכן קבוצה" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "לא ניתן לעדכן קבוצות עבור המארח שהתגלה „%1$s”." @@ -3086,12 +3090,12 @@ msgstr "לא ניתן לעדכן את מפת הרשת" msgid "Cannot update proxy" msgstr "לא ניתן לעדכן את המתווך" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "לא ניתן לעדכן את המתווך עבור המארח שהתגלה „%1$s”." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "לא ניתן לעדכן תפקיד משתמש לקריאה בלבד „%1$s”." @@ -3111,9 +3115,9 @@ msgstr "לא ניתן לעדכן דוח מתוזמן" msgid "Cannot update script" msgstr "לא ניתן לעדכן את הסקריפט" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "לא ניתן לעדכן את היקף הסקריפט. הסקריפט „%1$s” משמש את הפעולה „%2$s”." @@ -3296,8 +3300,8 @@ msgid "Character string not included" msgstr "מחרוזת תווים אינה כלולה" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "תווים" @@ -3473,7 +3477,7 @@ msgstr "שעון" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3511,13 +3515,13 @@ msgstr "סגירה" msgid "Close expression constructor" msgstr "סגירת מרכיב הביטויים" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "סגירת אירוע חדש" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "סגירת אירועים ישנים" @@ -3614,7 +3618,7 @@ msgstr "דחיסה" msgid "Concurrent sessions" msgstr "הפעלות בו־זמנית" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3625,11 +3629,6 @@ msgstr "תנאי" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "לא נעשה שימוש בתנאי „%2$s” בנוסחה „%3$s” עבור המשימה „%1$s”." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "לא נעשה שימוש בתנאי „%2$s” בנוסחה „%3$s” עבור היחס „%1$s”." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3645,11 +3644,6 @@ msgstr "התנאי „%2$s” לא נמצא בשימוש בנוסחה „%3$s” msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "התנאי „%2$s” בו נעשה שימוש בנוסחה „%3$s” עבור המשימה „%1$s” אינו מוגדר." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "התנאי „%2$s” בו נעשה שימוש בנוסחה „%3$s” עבור היחס „%1$s” אינו מוגדר." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3841,7 +3835,7 @@ msgstr "טקסט אימות" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "ברכותינו! התקנת בהצלחה את מנשק המשתמש של Zabbix." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4054,12 +4048,11 @@ msgstr "העתקה" msgid "Copy to clipboard" msgstr "העתקה ללוח הגזירים" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "יחס" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "היחס „%1$s“ כבר קיים." @@ -4086,16 +4079,6 @@ msgid_plural "Correlations enabled" msgstr[0] "היחס הופעל" msgstr[1] "היחסים הופעלו" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "ליחס חסר הפרמטר: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "שם היחס לא יכול להיות ריק." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "כלל יחס" @@ -4106,8 +4089,8 @@ msgstr "יחס עודכן" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "ספירה" @@ -4479,7 +4462,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "שם DNS" @@ -4754,8 +4737,8 @@ msgstr "דצמ׳" msgid "December" msgstr "דצמבר" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "מקומות עשרוניים" @@ -4765,7 +4748,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4862,7 +4845,7 @@ msgstr "בהשהיה של" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4912,7 +4895,7 @@ msgstr "למחוק ולפנות את התבנית? (אזהרה: כל המארח msgid "Delete current action?" msgstr "למחוק את המשימה הנוכחית?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "למחוק את היחס הנוכחי?" @@ -5210,7 +5193,7 @@ msgstr "רשימת דחייה" msgid "Dependencies" msgstr "תלויות" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "תלוי" @@ -5218,7 +5201,7 @@ msgstr "תלוי" msgid "Dependent item" msgstr "פריט תלוי" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5427,10 +5410,10 @@ msgstr "להשבית את תרחישי הרשת הנבחרים?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5513,7 +5496,7 @@ msgid "Discovery by proxy" msgstr "התגלה על ידי המתווך" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "בדיקת גילוי" @@ -5525,7 +5508,7 @@ msgstr "בדיקות גילוי" msgid "Discovery list" msgstr "רשימת גילוי" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "פריט גילוי" @@ -5624,7 +5607,7 @@ msgstr "כלל הגילוי התעדכן" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5635,7 +5618,7 @@ msgstr "כללי גילוי" msgid "Discovery rules deleted" msgstr "כללי גלוי נמחקו" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "מצב הגילוי" @@ -5791,18 +5774,6 @@ msgstr "ציור" msgid "Draw style" msgstr "סגנון ציור" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "ערך „%1$s” כפול „%2$s” עבור היחס „%3$s”." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "ערך „%1$s” כפול „%2$s” עבור יחס." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5815,11 +5786,6 @@ msgstr "ערך „name” (שם) כפול „%1$s” עבור מפה." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "„usrgrpid” (מזהה קבוצת משתמשים) כפול „%1$s” בקבוצות משתמשים למפה „%2$s”." -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "תנאים כפולים ליחס „%1$s”." - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5979,10 +5945,6 @@ msgstr "קובץ מפתח SSL ריק עבור תרחיש הרשת „%1$s”." msgid "Empty color." msgstr "צבע ריק." -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "מזהה היחס ריק." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6009,11 +5971,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "סוג תנאי מסנן ריק לפעולה „%1$s”." #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6198,7 +6158,7 @@ msgstr "הפעלת לכידה" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6209,7 +6169,7 @@ msgstr "הפעלת לכידה" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6252,7 +6212,7 @@ msgid "English (en_US)" msgstr "אנגלית (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6327,7 +6287,7 @@ msgid "Event correlation" msgstr "יחס בין אירועים" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "כללי יחסים בין אירועים" @@ -6362,11 +6322,11 @@ msgstr "ניטור יומן אירועים. מחזירה יומן אירועים msgid "Event name" msgstr "שם אירוע" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "צמד תגיות של אירוע" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "סוג אירוע" @@ -6702,7 +6662,6 @@ msgstr "לא ניתן להגדיר את השדה „%1$s” כריק (NULL)." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7070,7 +7029,7 @@ msgstr "קבלת ערך ממארח" msgid "Given expression is not a macro" msgstr "הביטוי שסופק אינו מאקרו" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "הביטוי הרגולרי הכללי „%1$s” לא קיים." @@ -7315,12 +7274,12 @@ msgstr "רשת" msgid "Group" msgstr "קבוצה" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "לא ניתן למחוק את הקבוצה „%1$s”, כיוון שנעשה בה שימוש לטובת אבטיפוס מארח." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "לא ניתן למחוק את הקבוצה „%1$s”, כיוון שנעשה בה שימוש לטובת תנאי יחס." @@ -7652,7 +7611,7 @@ msgstr[1] "מארחים" msgid "Host \"%1$s\" already exists." msgstr "המארח „%1$s” כבר קיים." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7660,7 +7619,7 @@ msgstr "המארח „%1$s” כבר קיים." msgid "Host \"%1$s\" cannot be without host group." msgstr "המארח „%1$s” לא יכול להישאר בלי קבוצת מארחים." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "המארח „%1$s” נמצא במעקב של המתווך „%2$s”." @@ -7731,17 +7690,17 @@ msgstr[1] "מארחים מופעלים" msgid "Host group" msgstr "קבוצת מארחים" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "קבוצת המארחים „%1$s” כבר קיימת." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "לא ניתן למחוק את קבוצת המארחים „%1$s”, כיוון שנעשה בה שימוש בסקריפט כללי." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "קבוצת המארחים „%1$s” היא פנימית ואי אפשר למחוק אותה." @@ -7755,9 +7714,9 @@ msgid "Host group label type" msgstr "סוג תווית קבוצת מארחים" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "קבוצת מארחים עם המזהה „%1$s” אינה זמינה." @@ -7773,8 +7732,8 @@ msgstr "קבוצת מארחים עם המזהה „%1$s” אינה זמינה." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7961,7 +7920,7 @@ msgstr "מארח עם אותו שם התצוגה „%1$s” כבר קיים." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8049,7 +8008,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "כתובת IP" @@ -8074,7 +8033,7 @@ msgstr "טווח ה־IP „%1$s” חורג ממגבלת הכתובות „%2 #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8131,12 +8090,12 @@ msgstr "הדגשת סמל" msgid "Icon map" msgstr "מפת סמלים" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "סמל המפה „%1$s” כבר קיים." -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "לא ניתן למחוק את מפת הסמלים „%1$s”. נעשה בה שימוש במפה „%2$s”." @@ -8160,7 +8119,7 @@ msgstr "מפת הסמלים עודכנה" msgid "Icon mapping" msgstr "מיפוי סמלים" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "הסמל עם המזהה „%1$s” לא זמין." @@ -8391,7 +8350,7 @@ msgstr "אבטיפוס פריט בלתי נגיש" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8404,11 +8363,11 @@ msgstr "מפה בלתי נגישה" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "תבנית בלתי נגישה" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "הקפצה בלתי נגישה" @@ -8620,24 +8579,6 @@ msgstr "קבוצת משתמשים של משימת פעולה שגויה. קבו msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "משתמש משימת הפעולה שגוי. המשתמש לא קיים או שאין לך גישה למשתמש זה." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8722,20 +8663,11 @@ msgstr "תנאים שגויים לפעולה „%1$s”." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "תנאים שגויים לכלל הגילוי „%1$s”." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "מזהה היחס שגוי." - #: 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." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "ביטוי מותאם אישית שגוי „%2$s” ליחס „%1$s”: %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8800,11 +8732,6 @@ msgstr "מזהה נוסחת תנאי מסנן שגויה עבור הפעולה msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "מזהה הנוסחה של תנאי המסנן שגוי עבור כלל הגילוי „%1$s”." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "מזהה הנוסחה של תנאי המסנן שסופק שגוי עבור היחס „%1$s”." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8912,7 +8839,7 @@ msgstr "מזהה המפה שגוי." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "שיטה שגויה „%1$s.%2$s”." @@ -9026,11 +8953,6 @@ msgstr "ביטוי אבטיפוס הקפצה שגוי. רכיבי ביטוי א msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "סוג חישוב שגוי לפעולה „%1$s”." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "סוג החישוב ליחס „%1$s” שגוי." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9052,10 +8974,10 @@ msgstr "מזהה משתמש שגוי צוין עבור המפה „%1$s”." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "מזהה קבוצת משתמשים שגוי צוין עבור המפה „%1$s”." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "שם המשתמש או הססמה או החשבון חסומים זמנית." @@ -9117,18 +9039,6 @@ msgstr "ערך שגוי „%1$s” עבור שדה מספר שלם „%2$s”." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "ערך שגוי „%1$s” עבור שדה מספר שלם וחיובי „%2$s”." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "ערך שגוי „%1$s” בשדה „%2$s” עבור היחס „%3$s”." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9190,12 +9100,6 @@ msgstr "ערך שגוי לשדה „%1$s”." #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9307,7 +9211,7 @@ msgstr "ערך שגוי לשדה „%1$s”." #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9318,9 +9222,9 @@ msgstr "ערך שגוי לשדה „%1$s”." #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9471,7 +9375,7 @@ msgstr "תגיות שהתקבלו בירושה ושל ההקפצה" msgid "Inherited items" msgstr "פריטים שהתקבלו בירושה" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "הוספה" @@ -9599,7 +9503,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "משך" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "שיטת API שגויה „%2$s” לתפקיד משתמש „%1$s”." @@ -9622,7 +9526,7 @@ msgstr "תכני קובץ ה־YAML שגויים" msgid "Invalid action condition: %1$s." msgstr "תנאי פעולה שגוי: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "תנאי שגוי: %1$s." @@ -9636,7 +9540,7 @@ msgstr "תאריך שגוי." msgid "Invalid email address \"%1$s\"." msgstr "כתובת דוא״ל שגויה „%1$s”." -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "כתובת דוא״ל שגויה עבור סוג המדיה עם המזהה „%1$s”." @@ -9683,9 +9587,11 @@ msgstr "הפרמטרים לשיטה שגויים." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9725,17 +9631,17 @@ msgstr "הפרמטרים לשיטה שגויים." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9743,14 +9649,14 @@ msgstr "הפרמטרים לשיטה שגויים." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9758,111 +9664,116 @@ msgstr "הפרמטרים לשיטה שגויים." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10073,7 +9984,7 @@ msgstr[1] "פריטים מופעלים" msgid "Item in \"not supported\" state" msgstr "פריט במצב „לא נתמך”" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "לא נבחר פריט" @@ -10252,7 +10163,7 @@ msgstr "פריטים התעדכנו" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10445,7 +10356,7 @@ msgstr "מיקום התווית" msgid "Language" msgstr "שפה" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "השפה „%1$s” אינה נתמכת." @@ -11046,7 +10957,7 @@ msgstr "ניהול דוחות מתוזמנים" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11288,7 +11199,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "תקופת הזמן המרבית להצגה היא יום %1$s." msgstr[1] "תקופת הזמן המרבית להצגה היא %1$s ימים." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "חרגת מהאורך הכללי המרבי המותר לכתובת דוא״ל עבור סוג המדיה עם המזהה „%1$s”." @@ -11313,7 +11224,7 @@ msgstr "מדיה" msgid "Media type" msgstr "סוג המדיה" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "סוג המדיה „%1$s“ כבר קיים." @@ -11357,7 +11268,7 @@ msgstr "בדיקת סוג מדיה מושבת הצליחה." msgid "Media type updated" msgstr "סוג המדיה עודכן" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "סוג המדיה עם המזהה „%1$s” אינו זמין." @@ -11369,7 +11280,7 @@ msgstr "סוג המדיה עם המזהה „%1$s” אינו זמין." msgid "Media types" msgstr "סוגי המדיה" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "סוגי המדיה שמשמשים את הפעולה „%1$s”." @@ -11616,7 +11527,7 @@ msgstr[1] "הופעלו מודולים: %1$s." msgid "Module updated: %1$s." msgstr "עודכן מודול: %1$s." -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "המודול עם המזהה „%2$s” אינו זמין לתפקיד המשתמש „%1$s”." @@ -12018,15 +11929,17 @@ msgstr "לוח מחוונים חדש" msgid "New element" msgstr "רכיב חדש" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "קבוצת אירועים למארחים חדשה" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "שם תגית אירוע חדש" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "ערך חדש לתגית אירועים" @@ -12046,7 +11959,7 @@ msgstr "שירות חדש" msgid "New service time" msgstr "זמן שירות חדש" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "שם תגית חדש" @@ -12073,7 +11986,7 @@ msgstr "השלב הבא" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12102,30 +12015,6 @@ msgstr "השלב הבא" msgid "No" msgstr "לא" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "לא סופק „%1$s” עבור היחס „%2$s”." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "לא סופק „%1$s” עבור יחס." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12175,11 +12064,6 @@ msgstr "לא צוין שם משתמש לאימות." msgid "No changes." msgstr "אין שינויים." -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "לא צוין סוג תנאי עבור היחס „%1$s”." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12318,17 +12202,46 @@ msgstr "לא נמצאו התאמות" msgid "No new modules discovered" msgstr "לא התגלו מודולים חדשים" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "לא צוין סוג משימה ליחס „%1$s”." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "אין הרשאות לגישה למערכת." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”." @@ -12364,10 +12277,9 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”." #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12395,13 +12307,18 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”." #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12421,8 +12338,8 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”." #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12445,24 +12362,24 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”." #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12484,16 +12401,16 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”." #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12549,7 +12466,7 @@ msgstr "לא הוגדרו הקפצות." msgid "No value" msgstr "אין ערך" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "הופסק השימוש בדגלונים שאינם בוליאנים." @@ -12619,15 +12536,15 @@ msgstr "לא כל התוצאות מוצגות. נא לספק תנאי חיפוש msgid "Not all templates are linked to \"%1$s\"." msgstr "לא כל התבנויות מקושרות אל „%1$s”." -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "אין הרשאה להגדיר שפה למשתמש „guest” (אורח)." -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "אין הרשאה להגדיר את הססמה למשתמש „guest” (אורח)." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "אין הרשאה להגדיר ערכת עיצוב למשתמש „guest” (אורח)." @@ -12961,15 +12878,16 @@ msgstr "כבוי" msgid "Ok" msgstr "בסדר" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "שם תגית אירוע ישן" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "ערך תגית אירוע ישן" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "שם התגית הקודם" @@ -12991,10 +12909,6 @@ msgstr "פעם אחת" msgid "One" msgstr "אחד" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "אחד מהפריטים נותר ללא קבוצת מארחים." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "פעם אחת בלבד" @@ -13004,10 +12918,6 @@ msgstr "פעם אחת בלבד" msgid "One-time downtime" msgstr "חוסר פעילות חד־פעמית" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "רק משתמשי על יכולים ליצור קבוצות מארחים." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "רק בדיקות של סוכן Zabbix, SNMPv1, SNMPv2 ו־SNMPv3 יכולות להיות ייחודיות." @@ -13056,10 +12966,6 @@ msgstr "רק שירותים בלי צאצאים" msgid "Only services without problem tags" msgstr "רק שירותים ללא תגיות של תקלות" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "רק מנהלי על יכולים ליצור יחסים." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "רק מנהלי על יכולים להגדיר בעלות על לוח מחוונים." @@ -13068,10 +12974,6 @@ msgstr "רק מנהלי על יכולים להגדיר בעלות על לוח מ msgid "Only super admins can set report owner." msgstr "רק מנהלי על יכולים להגדיר בעלות על דוח." -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "רק מנהלי על יכולים לעדכן יחסים." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "רק הקפצות שמוקצות למארחים מופעלים שתלויות בפריטים פעילים נספרות" @@ -13120,7 +13022,7 @@ msgstr "לפעולה אין תבנית לפעילות." msgid "Operational data" msgstr "נתונים תפעוליים" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13129,33 +13031,33 @@ msgstr "נתונים תפעוליים" msgid "Operations" msgstr "פעולות" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "מפעיל" @@ -13564,16 +13466,16 @@ msgstr "נווט" msgid "Parameter" msgstr "פרמטר" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "הפרמטר „%1$s” נזנח." @@ -13710,7 +13612,7 @@ msgstr "הדבקת וידג׳ט" msgid "Paste without external links" msgstr "הדבקה ללא קישורים חיצוניים" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "תבנית" @@ -13756,7 +13658,7 @@ msgstr "ביצוע שאילתת DNS. מחזירה מחרוזת תווים עם #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13889,7 +13791,7 @@ msgstr "ממלא שדה במאגר המארח" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14209,7 +14111,7 @@ msgstr "מתווכים" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14217,7 +14119,7 @@ msgstr "מתווכים" msgid "Proxy" msgstr "מתווך" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "המתווך „%1$s” כבר קיים." @@ -14227,12 +14129,12 @@ msgstr "המתווך „%1$s” כבר קיים." msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "המתווך „%1$s” עבור המארח „%2$s” לא קיים." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "הפעולה „%2$s” משתמשת במתווך „%1$s”." -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "נעשה שימוש במתווך „%1$s” על ידי כלל הגילוי „%2$s”." @@ -14507,7 +14409,7 @@ msgstr "רגיל" msgid "Regular expression" msgstr "ביטוי רגולרי" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "הביטוי הרגולרי „%1$s” כבר קיים." @@ -14767,7 +14669,7 @@ msgid "Replace dependencies" msgstr "החלפת תלויות" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "החלפה" @@ -14964,7 +14866,7 @@ msgstr "סוג התגובה: מחרוזת" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "תוצאה" @@ -15205,7 +15107,7 @@ msgstr "פתחת שרת ה־SMTP" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15503,7 +15405,7 @@ msgstr "היקף" msgid "Script" msgstr "סקריפט" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "הסקריפט „%1$s“ כבר קיים." @@ -15617,7 +15519,7 @@ msgid "Security name" msgstr "שם אבטחה" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15831,11 +15733,11 @@ msgstr "שחזור שירות" msgid "Service start time must be less than end time." msgstr "מועד ההתחלה של השירות חייב להיות לפני מועד הסיום." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "שם תגית שירות" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "ערך תגית שירות" @@ -15847,7 +15749,7 @@ msgstr "זמן שירות" msgid "Service times" msgstr "זמני שירות" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "סוג השירות" @@ -15860,7 +15762,7 @@ msgstr "עדכון שירות" msgid "Service updated" msgstr "השירות עודכן" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "השירות עם המזהה „%2$s” אינו זמין לתפקיד המשתמש „%1$s”." @@ -15872,7 +15774,7 @@ msgstr "השירות עם המזהה „%2$s” אינו זמין לתפקיד #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15890,9 +15792,9 @@ msgstr "שירותים עודכנו" msgid "Session initialization error." msgstr "שגיאת אתחול הפעלה." -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "ההפעלה נפסקה, נא להיכנס שוב, בבקשה." @@ -15954,7 +15856,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16799,10 +16701,10 @@ msgstr "לטבלה „%1$s“ אין שדה בשם „%2$s“." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "תגית" @@ -16939,7 +16841,7 @@ msgstr "תבנית" msgid "Template \"%1$s\" already exists." msgstr "התבנית „%1$s“ כבר קיימת." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17023,7 +16925,7 @@ msgstr "כבר קיימת תבנית עם אותו שם התצוגה „%1$s”. #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17320,7 +17222,7 @@ msgstr "עד" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17727,7 +17629,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17791,9 +17693,9 @@ msgstr "יש לבחור בשני רכיבים במפה" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17803,7 +17705,7 @@ msgstr "יש לבחור בשני רכיבים במפה" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17855,7 +17757,7 @@ msgstr "סוג מידע" msgid "Types" msgstr "סוגים" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "רכיב מנשק המשתמש „%2$s” אינו זמין לתפקיד המשתמש „%1$s”." @@ -17926,8 +17828,8 @@ msgstr "לכתובת אמורים להיות שני השדות: „name” ו־ msgid "URLs" msgstr "כתובות" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "אמור להיות UUIDv4" @@ -18037,21 +17939,23 @@ msgstr "יחידות" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "לא ידוע" @@ -18069,7 +17973,7 @@ msgid "Unknown error" msgstr "שגיאה לא ידועה" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "פריט מארח לא ידוע, אין כזה פריט במארח הנבחר" @@ -18208,7 +18112,7 @@ msgstr "פעיל" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18342,37 +18246,37 @@ msgstr "בשימוש בפעולות" msgid "User" msgstr "משתמש" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "המשתמש „%1$s” לא יכול להיות ללא קבוצת משתמשים." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "המשתמש „%1$s” הוא הבעלים של לוח המחוונים „%2$s”." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "המשתמש „%1$s” הוא הבעלים של המפה „%2$s”." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "הבעלות על הדוח „%2$s” היא של „%1$s”." -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "הדוח „%2$s” מיועד להישלח אל „%1$s”." -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "נעשה שימוש במשתמש „%1$s” בפעולה „%2$s”." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "הדוח „%2$s” נוצר בשם המשתמש „%1$s”." @@ -18394,13 +18298,13 @@ msgstr "משתמש נוסף" msgid "User agent string" msgstr "מחרוזת סוכן משתמש" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "המשתמש לא יכול להוסיף את עצמו לקבוצת משתמשים מושבתת או לקבוצה שהגישה שלה למנשק המשתמש הושבתה." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "המשתמש לא יכול לשנות את התפקיד של עצמו." @@ -18424,27 +18328,27 @@ msgstr[1] "משתמשים נמחקו" msgid "User group" msgstr "קבוצת משתמשים" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "קבוצת המשתמשים „%1$s” כבר קיימת." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "קבוצת המשתמשים „%1$s” היא הנמענת של הדוח „%2$s”." -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "כבר נעשה שימוש בקבוצת המשתמשים „%1$s” בפעולה „%2$s”." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "נעשה שימוש בקבוצת המשתמשים „%1$s” בהגדרות לקבלת הודעות על מסד נתונים מושבת." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "נעשה שימוש בקבוצת המשתמשים „%1$s” בקבוצה „%2$s”." @@ -18478,9 +18382,9 @@ msgstr[1] "קבוצות משתמשים עודכנו" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "קבוצת משתמשים עם המזהה „%1$s” אינה זמינה." @@ -18495,7 +18399,7 @@ msgstr "קבוצת משתמשים עם המזהה „%1$s” אינה זמינה msgid "User groups" msgstr "קבוצות משתמשים" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "למשתמש אין הרשאה למחוק את עצמו." @@ -18530,7 +18434,7 @@ msgstr "פרופיל משתמש" msgid "User role" msgstr "תפקיד משתמש" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "תפקיד המשתמש „%1$s” כבר קיים." @@ -18549,7 +18453,7 @@ msgstr[1] "תפקידי משתמשים נמחקו" msgid "User role updated" msgstr "תפקיד המשתמש עודכן" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "תפקיד משתמש עם המזהה „%1$s” אינו זמין." @@ -18599,12 +18503,12 @@ msgstr "משתמש עודכן" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "המשתמש עם המזהה „%1$s” לא זמין." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "כבר קיים משתמש עם השם „%1$s”." @@ -18915,14 +18819,14 @@ msgstr "אימות" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19034,11 +18938,12 @@ msgstr "ערך של כל מונה ביצועים של Windows באנגלית. מ msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "ערך של מונה ביצועים כלשהו של Windows. מחזירה מספר שלם, שבר עשרוני, מחרוזת או טקסט (בהתאם לבקשה)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "ערך של תגית אירוע חדשה" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "ערך של תגית אירוע ישנה" @@ -19575,7 +19480,7 @@ msgstr "שנתי" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19632,7 +19537,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "לא ציינת יעדים לסקריפט גלובלי לפעילויות פעולות „%1$s”." #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19768,11 +19672,11 @@ msgstr "[ערך שגוי ליום: „%1$s” ]" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "[ערך שגוי לחודש: „%1$s” ]" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "אמור להיות שם DNS" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "אמור להיות בוליאני" @@ -19780,16 +19684,16 @@ msgstr "אמור להיות בוליאני" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "אמור להיות מחרוזת תווים" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "התאריך אמור להיות בתצורה YYYY-MM-DD" @@ -19798,37 +19702,37 @@ msgid "a digit" msgstr "ספרה" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "אמור להיות ערך עם נקודה עשרונית" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "אמור להיות קוד צבע הקדסצימלי (6 תווים)" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "אמור להיות מאקרו לגילוי ברמה נמוכה" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "למספר יש יותר מדי ספרות אחרי הנקודה" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "אמור להיות מספר" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "המספר גדול מדי" @@ -19849,7 +19753,7 @@ msgstr "אמור להיות זמן יחסי" msgid "a special character" msgstr "תו מיוחד" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "אמור להיות מחרוזת, מספר או ריק" @@ -19857,19 +19761,19 @@ msgstr "אמור להיות מחרוזת, מספר או ריק" msgid "a time is expected" msgstr "אמור להיות זמן" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "אמור להיות טווח זמנים" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19919,7 +19823,7 @@ msgstr "הכול" msgid "all media" msgstr "כל סוגי המדיה" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "אמורה להיות כתובת IP" @@ -19941,23 +19845,23 @@ msgstr "אמורה להיות כתובת IP" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "אמור להיות מערך" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "אמור להיות מערך או מחרוזת תווים" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "אמור להיות מערך" @@ -19967,7 +19871,7 @@ msgid "an empty string is expected" msgstr "אמור להיות מחרוזת ריקה" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "אמור להיות מספר זוגי או תווים הקסדצימליים" @@ -19975,11 +19879,15 @@ msgstr "אמור להיות מספר זוגי או תווים הקסדצימלי msgid "an explicit time is expected" msgstr "אמורה להיות שעה מפורשת" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "אמור להיות ערך שלם" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "אמור להיות ערך שלם וחיובי" @@ -20140,13 +20048,7 @@ msgstr "לא ניתן לשנות" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20177,13 +20079,13 @@ msgstr "לא ניתן לשנות" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20201,14 +20103,14 @@ msgstr "לא ניתן לשנות" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20281,7 +20183,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "מכיל" @@ -20372,7 +20275,7 @@ msgstr "סדר יורד" msgid "description" msgstr "תיאור" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "התיקייה לא יכולה להיות ריקה" @@ -20394,13 +20297,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "כלל הגילוי „%1$s” במארח „%2$s” אינו במעקב" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "אינו מכיל" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "אינו שווה" @@ -20426,7 +20329,8 @@ msgid "e() - Returns Euler's number" 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/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20463,7 +20367,7 @@ msgstr "הביטוי ריק" msgid "failed to parse JSON" msgstr "פענוח ה־JSON נכשל" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20554,7 +20458,7 @@ msgstr "סמל" msgid "image" msgstr "תמונה" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20599,15 +20503,19 @@ msgstr "מניין רכיבים שגוי" msgid "incorrect expression starting from \"%1$s\"" msgstr "ביטוי שגוי החל מ־„%1$s”" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "שגיאת תחביר ליד „%1$s“" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "שימוש שגוי בפונקציה „%1$s”" @@ -20635,7 +20543,7 @@ msgstr "תבנית Prometheus שגויה" msgid "invalid address range \"%1$s\"" msgstr "טווח כתובות שגוי „%1$s”" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "רצף בתים שגוי ב־UTF-8" @@ -20664,27 +20572,27 @@ msgstr "משתנה רביעי שגוי בפונקציה „%1$s”" msgid "invalid history storage period" msgstr "תקופת אחסון היסטוריה שגויה" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "שם קבוצת המארחים שגויה" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "שם המארח שגוי" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "משתנה חמישי שגוי בפונקציה „%1$s”" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "ביטוי טווח שגוי" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "ביטוי רגולרי שגוי" @@ -20712,7 +20620,7 @@ msgstr "גדול או שווה" msgid "is less than or equals" msgstr "קטן או שווה" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "לא תחום ב־{} או שגוי" @@ -20862,7 +20770,7 @@ msgstr "התאמות" msgid "max" msgstr "מרבי" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "משך הזמן המרבי קטן ממשך הזמן של מסנן הזמן כבררת מחדל" @@ -20902,7 +20810,7 @@ msgid "min() - Minimum value for period T" msgstr "min() - ערך מזערי במשך T" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "האורך המזערי הוא %1$s תווים" @@ -20929,8 +20837,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "מש" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "חייב להיות באורך %1$s תווים" @@ -20951,8 +20859,8 @@ msgstr "חייב להיות באורך של %1$d תווים לפחות" msgid "must contain at least one digit" msgstr "חייב להכיל לפחות תו אחד" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "חייב להכיל לפחות מאקרו אחד של זיהוי ברמה נמוכה" @@ -21168,6 +21076,10 @@ msgstr "radians() - ממירה ערך ממעלות לרדיאנים" msgid "rand() - A random integer value" msgstr "rand() - ערך מספרי שלם אקראי" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21213,11 +21125,11 @@ msgstr "ביטוי רגולרי" msgid "regular expression" msgstr "ביטוי רגולרי" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "repeat() - מחזירה מחרוזת שמורכבת מערך שחוזר מספר פעמים" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "replace() - חיפוש מופעים של תבנית בערך מסוים והחלפתם" @@ -21229,15 +21141,15 @@ msgstr "החלפה" msgid "right" msgstr "ימינה" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "right() - מחזירה כמות כזאת של התווים הימניים ביותר" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "round() - מעגלת ערך למיקומים אחרי הנקודה העשרונית" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "rtrim() - מסירה תווים מסוימים מסוף המחרוזת" @@ -21285,7 +21197,7 @@ msgstr "שירות" msgid "short description" msgstr "תיאור קצר" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21304,15 +21216,15 @@ msgstr "תיאור קצר" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "אמור להיות ריק" @@ -21328,31 +21240,31 @@ msgstr "הצגת מיפוי סמלים" msgid "sign in as guest" msgstr "כניסה כאורח" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "signum() - מחזירה -1 אם ערך הוא שלילי, 0 עם הערך הוא אפס, 1 אם ערך הוא חיובי" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "sin() - סינוס של ערך, כאשר הערך הוא זווית שמיוצגת ברדיאנים" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "sinh() - הסינוס ההיפרבולי של הערך" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "skewness() - מודדת את האסימטריה של התפלגות ההסתברות" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "sqrt() - שורש ריבועי של ערך" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "stddevpop() - סטיית תקן של הקבוצה" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "stddevsamp() - סטיית תקן של מדגם" @@ -21360,15 +21272,15 @@ msgstr "stddevsamp() - סטיית תקן של מדגם" msgid "sum" msgstr "סכום" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "sum() - סכום הערכים במשך T" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "sumofsquares() - סכום ריבועים" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "פרטי הגישה שסופקו אינם יחודיים" @@ -21381,7 +21293,7 @@ msgstr "פרטי הגישה שסופקו אינם יחודיים" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21392,7 +21304,7 @@ msgstr "פרטי הגישה שסופקו אינם יחודיים" msgid "tag" msgstr "תגית" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "tan() - הטנגנס (משיק) של הערך" @@ -21401,14 +21313,14 @@ msgstr "tan() - הטנגנס (משיק) של הערך" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "מזהה התבנית %1$s מועבר %2$s פעמים" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21420,20 +21332,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "הפרמטר „%1$s” חסר" @@ -21465,7 +21377,7 @@ msgstr "שלישי" msgid "third parameter is expected" msgstr "אמור להיות משתנה שלישי" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "משך הזמן כבררת המחדל של מסנן הזמן חורג ממשך הזמן המרבי" @@ -21473,31 +21385,31 @@ msgstr "משך הזמן כבררת המחדל של מסנן הזמן חורג מ msgid "time shift" msgstr "הפרש זמן" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "time() - השעה הנוכחית" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft() - זמן להגיע לסף המוערך בהתאם למשך T" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "trendavg() - ערך ממוצע של משך זמן T עם הזחת משך זמן מדויקת" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "trendcount() - מספר הערכים שהתקבלו בהצלחה בפרק הזמן T" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "trendmax() - ערך מרבי לפרק זמן T עם הזחת זמן מדויקת" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "trendmin() - ערך מזערי לפרק זמן T עם הזחת זמן מדויקת" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "trendsum() - סכוםה ערכים לפרק זמן T עם הזחת זמן מדויקת" @@ -21511,7 +21423,7 @@ msgstr "הקפצה" msgid "trigger does not allow manual closing" msgstr "ההקפצה אינה מאפשרת סגירה ידנית" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "ביטוי ההקפצה חייב להכיל לפחות הפניית /מארח/ערך אחת" @@ -21523,11 +21435,11 @@ msgstr "אבטיפוס ההקפצה אינו ניתן להעברה לתבנית msgid "trigger with linkages cannot be moved to another template or host" msgstr "הקפצות עם קישוריות אינן ניתנות להעברה לתבנית או למארח אחרים" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "trim() - הסרת תווים מסוימים מתחילת או סוף מחרוזת" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "truncate() - קוצץ ערך למקומות עשרוניים" @@ -21536,7 +21448,7 @@ msgstr "truncate() - קוצץ ערך למקומות עשרוניים" msgid "type here to search" msgstr "יש להקליד כאן כדי לחפש" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "כתובת לא מקובלת" @@ -21584,11 +21496,12 @@ msgstr "סוף המאקרו בלתי צפוי" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "הפרמטר בלתי מתקבל „%1$s”" @@ -21614,8 +21527,8 @@ msgstr "הטקסט „%1$s“ בלתי צפוי" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21640,6 +21553,10 @@ msgstr "סיומת הזמן אינה נתמכת" msgid "unsupported version number" msgstr "מספר הגרסה אינו נתמך" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21697,61 +21614,69 @@ msgstr "הערך „%1$s” לא נמצא" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "הערך %1$s כבר קיים" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "הערך ארוך מדי" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 -#, c-format +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 +#, fuzzy, c-format msgid "value must be %1$s" -msgstr "הערך חייב להיות %1$s" +msgid_plural "value must be one of %1$s" +msgstr[0] "הערך חייב להיות %1$s" +msgstr[1] "הערך חייב להיות %1$s" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "הערך חייב להיות בין „%1$s” לבין „%2$s”" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "הערך חייב להיות ריק" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "הערך חייב להיות ריק או אחד מבין %1$s" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21782,15 +21707,13 @@ msgstr "הערך לא יכול להיות פחות מאשר „%1$s”" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "הערך חייב להיות אחד מבין %1$s" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "הערך חייב להיות בטווח של %1$s" @@ -21799,7 +21722,7 @@ msgstr "הערך חייב להיות בטווח של %1$s" msgid "value of first parameter is too long" msgstr "ערך המשתנה הראשון ארוך מדי" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "ערך של תגית אירוע חדשה" @@ -21812,11 +21735,11 @@ msgstr "ערך המשתנה השני ארוך מדי" msgid "value of third parameter must be one of %1$s" msgstr "ערך המשתנה השלישי חייב להיות אחת מתוך %1$s" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "varpop() - שונות אוכלוסיה" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "varsamp() - סטיית דגימה" diff --git a/ui/locale/hu/LC_MESSAGES/frontend.po b/ui/locale/hu/LC_MESSAGES/frontend.po index 08d79240d0c..d68186bc773 100644 --- a/ui/locale/hu/LC_MESSAGES/frontend.po +++ b/ui/locale/hu/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2013-01-09 22:10+0300\n" "Last-Translator: Robert <szenasy.robert@gmail.com>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -500,7 +500,7 @@ msgstr "Visszaigazolás" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Nyugtázva" @@ -599,7 +599,7 @@ msgstr "" msgid "Action \"%1$s\" no operations defined." msgstr "" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -725,7 +725,7 @@ msgstr "Aktív eddig" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -736,7 +736,7 @@ msgstr "Aktív eddig" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -992,7 +992,7 @@ msgstr "" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1314,7 +1314,7 @@ msgstr "" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1323,8 +1323,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1335,6 +1335,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1346,7 +1351,7 @@ msgstr "" msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1432,7 +1437,7 @@ msgstr "Authentikáció" msgid "Authentication algorithm" msgstr "Autentikációs algoritmus" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1481,7 +1486,7 @@ msgstr "" msgid "Auto-login" msgstr "Automatikus belépés" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1492,7 +1497,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1751,7 +1756,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1786,7 +1791,7 @@ msgstr "Visszahívás" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1992,7 +1997,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2114,7 +2119,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "" @@ -2123,7 +2128,7 @@ msgstr "" msgid "Cannot delete action" msgstr "Az eljárást nem lehet törölni" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2191,7 +2196,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2262,7 +2267,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "Proxy törlése sikertelen" msgstr[1] "Proxy törlése sikertelen" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2286,7 +2291,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "Script törlése sikertelen" msgstr[1] "Script törlése sikertelen" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "" @@ -2680,16 +2685,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2702,7 +2707,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "" msgstr[1] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "" @@ -2723,7 +2728,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2785,7 +2790,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "" @@ -2868,7 +2873,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "" @@ -2881,7 +2886,7 @@ msgstr "Minta leválasztása sikertelen" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2943,8 +2948,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -3004,9 +3010,7 @@ msgstr "" msgid "Cannot update group" msgstr "Csoport frissítése sikertelen" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -3089,12 +3093,12 @@ msgstr "Hálózati térkép frissítése sikertelen" msgid "Cannot update proxy" msgstr "Proxy frissítése sikertelen" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3114,9 +3118,9 @@ msgstr "" msgid "Cannot update script" msgstr "Script frissítése sikertelen" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3299,8 +3303,8 @@ msgid "Character string not included" msgstr "Nem tartalmazza a következő szót" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3476,7 +3480,7 @@ msgstr "Óra" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3514,13 +3518,13 @@ msgstr "Bezár" msgid "Close expression constructor" msgstr "" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3617,7 +3621,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3628,11 +3632,6 @@ msgstr "Feltétel" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3648,11 +3647,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3844,7 +3838,7 @@ msgstr "" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4046,12 +4040,11 @@ msgstr "Másolás" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4078,16 +4071,6 @@ msgid_plural "Correlations enabled" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4098,8 +4081,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Számol" @@ -4471,7 +4454,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS név" @@ -4746,8 +4729,8 @@ msgstr "" msgid "December" msgstr "December" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4757,7 +4740,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4854,7 +4837,7 @@ msgstr "Késleltetve" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4904,7 +4887,7 @@ msgstr "" msgid "Delete current action?" msgstr "" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5202,7 +5185,7 @@ msgstr "" msgid "Dependencies" msgstr "" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Függő" @@ -5210,7 +5193,7 @@ msgstr "Függő" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5419,10 +5402,10 @@ msgstr "" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5505,7 +5488,7 @@ msgid "Discovery by proxy" msgstr "Felderítés proxy-n keresztül" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Felderítés" @@ -5517,7 +5500,7 @@ msgstr "" msgid "Discovery list" msgstr "" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "" @@ -5617,7 +5600,7 @@ msgstr "Felderítési szabály frissítve" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5628,7 +5611,7 @@ msgstr "" msgid "Discovery rules deleted" msgstr "Felderítési szabályok törölve" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Felderítés állapota" @@ -5784,18 +5767,6 @@ msgstr "" msgid "Draw style" msgstr "Rajz stílusa" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5808,11 +5779,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5972,10 +5938,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6002,11 +5964,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6191,7 +6151,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6202,7 +6162,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6245,7 +6205,7 @@ msgid "English (en_US)" msgstr "" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6321,7 +6281,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6356,11 +6316,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6696,7 +6656,6 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7064,7 +7023,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7309,12 +7268,12 @@ msgstr "" msgid "Group" msgstr "Csoport" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7647,7 +7606,7 @@ msgstr[1] "Hoszt" msgid "Host \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7655,7 +7614,7 @@ msgstr "" msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7726,17 +7685,17 @@ msgstr[1] "" msgid "Host group" msgstr "Hoszt csoport" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7750,9 +7709,9 @@ msgid "Host group label type" msgstr "" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7768,8 +7727,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7956,7 +7915,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8044,7 +8003,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP cím" @@ -8069,7 +8028,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8126,12 +8085,12 @@ msgstr "" msgid "Icon map" msgstr "" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "" @@ -8155,7 +8114,7 @@ msgstr "" msgid "Icon mapping" msgstr "" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8386,7 +8345,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8399,11 +8358,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8615,24 +8574,6 @@ msgstr "" msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "" -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8717,20 +8658,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8795,11 +8727,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8907,7 +8834,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -9021,11 +8948,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9047,10 +8969,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9112,18 +9034,6 @@ msgstr "" msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9185,12 +9095,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9302,7 +9206,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9313,9 +9217,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9466,7 +9370,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Beszúrás" @@ -9594,7 +9498,7 @@ msgstr "" msgid "Interval" msgstr "Intervallum" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9617,7 +9521,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9631,7 +9535,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9678,9 +9582,11 @@ msgstr "" #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9720,17 +9626,17 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9738,14 +9644,14 @@ msgstr "" #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9753,111 +9659,116 @@ msgstr "" #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10068,7 +9979,7 @@ msgstr[1] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10247,7 +10158,7 @@ msgstr "Adatsorok hozzáadva" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10440,7 +10351,7 @@ msgstr "Cimke elhelyezkedése" msgid "Language" msgstr "Nyelv" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11041,7 +10952,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11283,7 +11194,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11308,7 +11219,7 @@ msgstr "Eszköztípus" msgid "Media type" msgstr "Eszköztípus" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11352,7 +11263,7 @@ msgstr "" msgid "Media type updated" msgstr "Eszköztípus frissítve" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11364,7 +11275,7 @@ msgstr "" msgid "Media types" msgstr "Eszköztípusok" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11611,7 +11522,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12013,15 +11924,17 @@ msgstr "" msgid "New element" msgstr "" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12041,7 +11954,7 @@ msgstr "" msgid "New service time" msgstr "Új szolgáltatási időszak felvétele" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12068,7 +11981,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12097,30 +12010,6 @@ msgstr "" msgid "No" msgstr "Nem" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12170,11 +12059,6 @@ msgstr "" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12313,17 +12197,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12359,10 +12272,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12390,13 +12302,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12416,8 +12333,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12440,24 +12357,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12479,16 +12396,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12544,7 +12461,7 @@ msgstr "" msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12614,15 +12531,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12956,15 +12873,16 @@ msgstr "KIKAPCSOL" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12986,10 +12904,6 @@ msgstr "" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Egy alkalommal" @@ -12999,10 +12913,6 @@ msgstr "Egy alkalommal" msgid "One-time downtime" msgstr "Egyszeri kiesés" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "" - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -13051,10 +12961,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13063,10 +12969,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Csak az engedélyezett hosztokhoz rendelt, engedélyezett elemekhez tartozó triggerekből számítva" @@ -13115,7 +13017,7 @@ msgstr "" msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13124,33 +13026,33 @@ msgstr "" msgid "Operations" msgstr "Műveletek" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operátor" @@ -13559,16 +13461,16 @@ msgstr "" msgid "Parameter" msgstr "Paraméter" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13705,7 +13607,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13751,7 +13653,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13884,7 +13786,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14204,7 +14106,7 @@ msgstr "Proxik" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14212,7 +14114,7 @@ msgstr "Proxik" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14222,12 +14124,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "" -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "" @@ -14502,7 +14404,7 @@ msgstr "" msgid "Regular expression" msgstr "Reguláris kifejezés" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14763,7 +14665,7 @@ msgid "Replace dependencies" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14960,7 +14862,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Eredmény" @@ -15201,7 +15103,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15499,7 +15401,7 @@ msgstr "" msgid "Script" msgstr "Script" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15613,7 +15515,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15828,11 +15730,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "" -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15844,7 +15746,7 @@ msgstr "" msgid "Service times" msgstr "Szolgáltatási időszakok" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Szerviz típus" @@ -15857,7 +15759,7 @@ msgstr "" msgid "Service updated" msgstr "Szolgáltatás frissítve" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15869,7 +15771,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15887,9 +15789,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "" @@ -15951,7 +15853,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16796,10 +16698,10 @@ msgstr "" #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Cimke" @@ -16936,7 +16838,7 @@ msgstr "Minta" msgid "Template \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17020,7 +16922,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17317,7 +17219,7 @@ msgstr "-ig" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17724,7 +17626,7 @@ msgstr "Trigger frissítve" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17788,9 +17690,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17800,7 +17702,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17852,7 +17754,7 @@ msgstr "Információ típusa" msgid "Types" msgstr "Típusok" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17923,8 +17825,8 @@ msgstr "" msgid "URLs" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18034,21 +17936,23 @@ msgstr "Egységek" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Ismeretlen" @@ -18066,7 +17970,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "" @@ -18205,7 +18109,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18339,37 +18243,37 @@ msgstr "" msgid "User" msgstr "Felhasználó" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18391,13 +18295,13 @@ msgstr "Új felhasználó felvéve" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "" #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18421,27 +18325,27 @@ msgstr[1] "" msgid "User group" msgstr "Felhasználói csoport" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "" @@ -18475,9 +18379,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18492,7 +18396,7 @@ msgstr "" msgid "User groups" msgstr "Felhasználói csoportok" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "" @@ -18527,7 +18431,7 @@ msgstr "Felhasználói profil" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18546,7 +18450,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18596,12 +18500,12 @@ msgstr "Felhasználó frissítve" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18912,14 +18816,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19031,11 +18935,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19572,7 +19477,7 @@ msgstr "Évi" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19629,7 +19534,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19762,11 +19666,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19774,16 +19678,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19792,37 +19696,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19843,7 +19747,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19851,19 +19755,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19913,7 +19817,7 @@ msgstr "mind" msgid "all media" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19935,23 +19839,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19961,7 +19865,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19969,11 +19873,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20134,13 +20042,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20171,13 +20073,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20195,14 +20097,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20275,7 +20177,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20366,7 +20269,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20388,13 +20291,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20420,7 +20323,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20457,7 +20361,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20548,7 +20452,7 @@ msgstr "" msgid "image" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20593,15 +20497,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20629,7 +20537,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20658,27 +20566,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20706,7 +20614,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20856,7 +20764,7 @@ msgstr "" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20896,7 +20804,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20923,8 +20831,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20945,8 +20853,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21162,6 +21070,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21207,11 +21119,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21223,15 +21135,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21279,7 +21191,7 @@ msgstr "" msgid "short description" msgstr "rövid leírás" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21298,15 +21210,15 @@ msgstr "rövid leírás" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21322,31 +21234,31 @@ msgstr "" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21354,15 +21266,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21375,7 +21287,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21386,7 +21298,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21395,14 +21307,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21414,20 +21326,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21459,7 +21371,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21467,31 +21379,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21505,7 +21417,7 @@ msgstr "" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21517,11 +21429,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21530,7 +21442,7 @@ msgstr "" msgid "type here to search" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21578,11 +21490,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21608,8 +21521,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21634,6 +21547,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21691,61 +21608,69 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21776,15 +21701,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21793,7 +21716,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21806,11 +21729,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/id/LC_MESSAGES/frontend.po b/ui/locale/id/LC_MESSAGES/frontend.po index 3181708e1c8..ade10c4f698 100644 --- a/ui/locale/id/LC_MESSAGES/frontend.po +++ b/ui/locale/id/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2013-10-10 08:26+0300\n" "Last-Translator: richlv <richlv@nakts.net>\n" "Language-Team: none\n" @@ -479,7 +479,7 @@ msgstr "Pemberitahuan" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Pemberitahuan" @@ -578,7 +578,7 @@ msgstr "" msgid "Action \"%1$s\" no operations defined." msgstr "" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -702,7 +702,7 @@ msgstr "Aktif sampai" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -713,7 +713,7 @@ msgstr "Aktif sampai" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -969,7 +969,7 @@ msgstr "Usia kurang dari" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1291,7 +1291,7 @@ msgstr "Pada (jam:menit)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1300,8 +1300,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1312,6 +1312,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1323,7 +1328,7 @@ msgstr "Setidaknya satu periode pemeliharaan harus dibuat." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1409,7 +1414,7 @@ msgstr "Otentikasi" msgid "Authentication algorithm" msgstr "Algoritma otentikasi" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1458,7 +1463,7 @@ msgstr "" msgid "Auto-login" msgstr "Login-otomatis" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1469,7 +1474,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1728,7 +1733,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1763,7 +1768,7 @@ msgstr "Callback" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1968,7 +1973,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2086,7 +2091,7 @@ msgid "Cannot delete API token" msgid_plural "Cannot delete API tokens" msgstr[0] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Tidak dapat menghapus user Zabbix internal \"%1$s\", coba non-aktifkan user tersebut." @@ -2095,7 +2100,7 @@ msgstr "Tidak dapat menghapus user Zabbix internal \"%1$s\", coba non-aktifkan u msgid "Cannot delete action" msgstr "Tidak dapat menghapus aksi" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2158,7 +2163,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group." msgstr[0] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2225,7 +2230,7 @@ msgid "Cannot delete proxy" msgid_plural "Cannot delete proxies" msgstr[0] "Tidak dapat menghapus proxy" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2245,7 +2250,7 @@ msgid "Cannot delete script" msgid_plural "Cannot delete scripts" msgstr[0] "Tidak dapat menghapus script" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Tidak dapat menghapus script. Script %1$s\" sedang digunakan pada operasi aksi \"%2$s\"." @@ -2615,16 +2620,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2636,7 +2641,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist. msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist." msgstr[0] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "" @@ -2656,7 +2661,7 @@ msgid "Cannot load module at: %1$s." msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2718,7 +2723,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Tidak dapat merubah nama guest user." @@ -2800,7 +2805,7 @@ msgid "Cannot unblock user" msgid_plural "Cannot unblock users" msgstr[0] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "" @@ -2813,7 +2818,7 @@ msgstr "Tidak dapat membatalkan hubungan template" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2875,8 +2880,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -2935,9 +2941,7 @@ msgstr "" msgid "Cannot update group" msgstr "Tidak dapat perbarui grup" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -3018,12 +3022,12 @@ msgstr "Tidak dapat perbarui peta jaringan" msgid "Cannot update proxy" msgstr "Tidak dapat perbarui proxy" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3043,9 +3047,9 @@ msgstr "" msgid "Cannot update script" msgstr "Tidak dapat perbarui script" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3226,8 +3230,8 @@ msgid "Character string not included" msgstr "Tidak termasuk string karakter" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3403,7 +3407,7 @@ msgstr "Jam" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3441,13 +3445,13 @@ msgstr "Tutup" msgid "Close expression constructor" msgstr "Tutup pembangun ekspresi" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3544,7 +3548,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3555,11 +3559,6 @@ msgstr "Kondisi" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3575,11 +3574,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3771,7 +3765,7 @@ msgstr "Teks konfirmasi" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -3973,12 +3967,11 @@ msgstr "Salin" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4002,16 +3995,6 @@ msgid "Correlation enabled" msgid_plural "Correlations enabled" msgstr[0] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4022,8 +4005,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Hitung" @@ -4395,7 +4378,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "Nama DNS" @@ -4669,8 +4652,8 @@ msgstr "Des" msgid "December" msgstr "Desember" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4680,7 +4663,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4777,7 +4760,7 @@ msgstr "Delay oleh" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4827,7 +4810,7 @@ msgstr "Hapus dan bersihkan template? (Peringatan: semua host yang terhubung aka msgid "Delete current action?" msgstr "Hapus aksi yang berlaku?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5125,7 +5108,7 @@ msgstr "" msgid "Dependencies" msgstr "Dependensi" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Tergantung" @@ -5133,7 +5116,7 @@ msgstr "Tergantung" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5342,10 +5325,10 @@ msgstr "" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5428,7 +5411,7 @@ msgid "Discovery by proxy" msgstr "Penemuan berdasarkan proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Periksa penemuan" @@ -5440,7 +5423,7 @@ msgstr "Periksa penemuan" msgid "Discovery list" msgstr "Daftar penemuan" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Obyek penemuan" @@ -5537,7 +5520,7 @@ msgstr "Aturan penemuan diperbarui" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5548,7 +5531,7 @@ msgstr "Aturan penemuan" msgid "Discovery rules deleted" msgstr "Aturan penemuan dihapus" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Status penemuan" @@ -5704,18 +5687,6 @@ msgstr "" msgid "Draw style" msgstr "Menggambar gaya" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5728,11 +5699,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5892,10 +5858,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -5922,11 +5884,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6111,7 +6071,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6122,7 +6082,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6165,7 +6125,7 @@ msgid "English (en_US)" msgstr "English (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6241,7 +6201,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6276,11 +6236,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6615,7 +6575,6 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -6983,7 +6942,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Ekspresi yang diberikan bukan sebuah macro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7227,12 +7186,12 @@ msgstr "Kisi-kisi" msgid "Group" msgstr "Grup" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7563,7 +7522,7 @@ msgstr[0] "Host" msgid "Host \"%1$s\" already exists." msgstr "Host \"%1$s\" sudah ada." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7571,7 +7530,7 @@ msgstr "Host \"%1$s\" sudah ada." msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7640,17 +7599,17 @@ msgstr[0] "" msgid "Host group" msgstr "Host grup" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Host grup \"%1$s\" sudah ada." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7664,9 +7623,9 @@ msgid "Host group label type" msgstr "Tipe label grup host" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7682,8 +7641,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7869,7 +7828,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -7957,7 +7916,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "Alamat IP" @@ -7982,7 +7941,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8039,12 +7998,12 @@ msgstr "Ikon sorot" msgid "Icon map" msgstr "Ikon peta" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Peta ikon \"%1$s\" tidak dapat dihapus. Digunakan pada peta \"%2$s\"." @@ -8068,7 +8027,7 @@ msgstr "Peta ikon diperbarui" msgid "Icon mapping" msgstr "Pemetaan ikon" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8297,7 +8256,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8310,11 +8269,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8526,24 +8485,6 @@ msgstr "Kesalahan aksi operasi grup user. Grup user tidak ada atau Anda tidak me msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Kesalahan aksi operasi user. User tidak ada atau Anda tidak memiliki akses ke user ini." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8628,20 +8569,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8706,11 +8638,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8818,7 +8745,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -8932,11 +8859,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -8958,10 +8880,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9023,18 +8945,6 @@ msgstr "Kesalahan nilai \"%1$s\" untuk field int \"%2$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Kesalahan nilai \"%1$s\" untuk field int yang tidak ditandai \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9096,12 +9006,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9213,7 +9117,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9224,9 +9128,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9377,7 +9281,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Sisipkan" @@ -9505,7 +9409,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Interval" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9528,7 +9432,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9542,7 +9446,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9589,9 +9493,11 @@ msgstr "Metode parameter tidak sah." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9631,17 +9537,17 @@ msgstr "Metode parameter tidak sah." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9649,14 +9555,14 @@ msgstr "Metode parameter tidak sah." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9664,111 +9570,116 @@ msgstr "Metode parameter tidak sah." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -9976,7 +9887,7 @@ msgstr[0] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10154,7 +10065,7 @@ msgstr "Item diperbarui" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10347,7 +10258,7 @@ msgstr "Label lokasi" msgid "Language" msgstr "Bahasa" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -10942,7 +10853,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11183,7 +11094,7 @@ msgid "Maximum time period to display is %1$s day." msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11208,7 +11119,7 @@ msgstr "Media" msgid "Media type" msgstr "Tipe media" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11251,7 +11162,7 @@ msgstr "" msgid "Media type updated" msgstr "Tipe media diperbarui" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11263,7 +11174,7 @@ msgstr "" msgid "Media types" msgstr "Tipe media" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11505,7 +11416,7 @@ msgstr[0] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -11907,15 +11818,17 @@ msgstr "" msgid "New element" msgstr "Element baru" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -11935,7 +11848,7 @@ msgstr "" msgid "New service time" msgstr "Waktu service baru" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -11962,7 +11875,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -11991,30 +11904,6 @@ msgstr "" msgid "No" msgstr "Tidak" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12064,11 +11953,6 @@ msgstr "Tidak ada otentikasi nama user yang spesifik." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12207,17 +12091,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Tidak ada izin untuk akses sistem." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12253,10 +12166,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12284,13 +12196,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12310,8 +12227,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12334,24 +12251,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12373,16 +12290,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12438,7 +12355,7 @@ msgstr "Tidak ada trigger yang didefinisikan." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12508,15 +12425,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Tidak diizinkan menggunakan password untuk user \"guest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12850,15 +12767,16 @@ msgstr "Mati" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12880,10 +12798,6 @@ msgstr "Sekali" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Satu kali saja" @@ -12893,10 +12807,6 @@ msgstr "Satu kali saja" msgid "One-time downtime" msgstr "Satu-kali downtime" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Hanya Super admin yang bisa membuat grup host." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -12944,10 +12854,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -12956,10 +12862,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Hanya trigger yang ditugaskan ke host aktif dan tergantung pada item aktif yang dihitung." @@ -13008,7 +12910,7 @@ msgstr "Operasi tidak memiliki template untuk beroperasi." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13017,33 +12919,33 @@ msgstr "" msgid "Operations" msgstr "Operasi" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operator" @@ -13452,16 +13354,16 @@ msgstr "" msgid "Parameter" msgstr "Parameter" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13598,7 +13500,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13644,7 +13546,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13777,7 +13679,7 @@ msgstr "Mengisi field inventaris host" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14097,7 +13999,7 @@ msgstr "Proxy" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14105,7 +14007,7 @@ msgstr "Proxy" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14115,12 +14017,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Proxy \"%1$s\" untuk host \"%2$s\" tidak ada." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Proxy \"%1$s\" sedang digunakan oleh aturan discovery \"%2$s\"." @@ -14394,7 +14296,7 @@ msgstr "" msgid "Regular expression" msgstr "Ekspresi reguler" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14653,7 +14555,7 @@ msgid "Replace dependencies" msgstr "Gantikan dependensi" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14850,7 +14752,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Hasil " @@ -15091,7 +14993,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15386,7 +15288,7 @@ msgstr "" msgid "Script" msgstr "Skrip" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15499,7 +15401,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15713,11 +15615,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Waktu mulai service harus lebih kecil dari waktu akhir." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15729,7 +15631,7 @@ msgstr "" msgid "Service times" msgstr "Waktu service" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Tipe service" @@ -15742,7 +15644,7 @@ msgstr "" msgid "Service updated" msgstr "Service diperbarui" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15754,7 +15656,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15772,9 +15674,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Sesi dimatikan, mohon login kembali." @@ -15836,7 +15738,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16681,10 +16583,10 @@ msgstr "Tabel \"%1$s\" tidak memiliki field dengan nama \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Label" @@ -16821,7 +16723,7 @@ msgstr "Template" msgid "Template \"%1$s\" already exists." msgstr "Template \"%1$s\" sudah ada." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -16905,7 +16807,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17200,7 +17102,7 @@ msgstr "Hingga" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17603,7 +17505,7 @@ msgstr "Trigger diperbarui" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17667,9 +17569,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17679,7 +17581,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17731,7 +17633,7 @@ msgstr "Tipe informasi" msgid "Types" msgstr "Tipe" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17802,8 +17704,8 @@ msgstr "" msgid "URLs" msgstr "URL" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -17913,21 +17815,23 @@ msgstr "Unit" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Tidak dikenal" @@ -17945,7 +17849,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Item host yang tidak dikenal, tidak ada item tersebut dalam host yang terpilih" @@ -18083,7 +17987,7 @@ msgstr "Nyala" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18217,37 +18121,37 @@ msgstr "Digunakan dalam aksi" msgid "User" msgstr "User" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18269,13 +18173,13 @@ msgstr "User ditambah" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "User tidak dapat menambah dirinya sendiri ke grup non-aktif atau grup dengan akses GUI non-aktif." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18298,27 +18202,27 @@ msgstr[0] "User dihapus" msgid "User group" msgstr "Grup user" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Grup user \"%1$s\" digunakan dalam skrip \"%2$s\"." @@ -18350,9 +18254,9 @@ msgstr[0] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18367,7 +18271,7 @@ msgstr "" msgid "User groups" msgstr "Grup user" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "User tidak diizinkan menghapus dirinya sendiri." @@ -18402,7 +18306,7 @@ msgstr "Profil user" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18420,7 +18324,7 @@ msgstr[0] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18469,12 +18373,12 @@ msgstr "User diperbarui" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18785,14 +18689,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -18904,11 +18808,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19443,7 +19348,7 @@ msgstr "Tahunan" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19500,7 +19405,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19633,11 +19537,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19645,16 +19549,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19663,37 +19567,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19714,7 +19618,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19722,19 +19626,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19784,7 +19688,7 @@ msgstr "semua" msgid "all media" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19806,23 +19710,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19832,7 +19736,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19840,11 +19744,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20005,13 +19913,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20042,13 +19944,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20066,14 +19968,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20146,7 +20048,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20237,7 +20140,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20259,13 +20162,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20291,7 +20194,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20328,7 +20232,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20419,7 +20323,7 @@ msgstr "ikon" msgid "image" msgstr "gambar" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20464,15 +20368,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20500,7 +20408,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20529,27 +20437,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20577,7 +20485,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20727,7 +20635,7 @@ msgstr "" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20767,7 +20675,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20794,8 +20702,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20816,8 +20724,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21033,6 +20941,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21078,11 +20990,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21094,15 +21006,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21150,7 +21062,7 @@ msgstr "" msgid "short description" msgstr "penjelasan singkat" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21169,15 +21081,15 @@ msgstr "penjelasan singkat" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21193,31 +21105,31 @@ msgstr "tampilkan pemetaan ikon" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21225,15 +21137,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21246,7 +21158,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21257,7 +21169,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21266,14 +21178,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "template ID \"%1$s\" dilewatkan %2$s kali" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21285,20 +21197,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21330,7 +21242,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21338,31 +21250,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21376,7 +21288,7 @@ msgstr "trigger" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21388,11 +21300,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21401,7 +21313,7 @@ msgstr "" msgid "type here to search" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21449,11 +21361,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21479,8 +21392,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21505,6 +21418,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21562,61 +21479,67 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21647,15 +21570,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21664,7 +21585,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21677,11 +21598,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/it/LC_MESSAGES/frontend.po b/ui/locale/it/LC_MESSAGES/frontend.po index 1d0bbba2650..fcdbec27688 100644 --- a/ui/locale/it/LC_MESSAGES/frontend.po +++ b/ui/locale/it/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2016-04-20 12:06+0300\n" "Last-Translator: quadrata <dimitri.bellini@quadrata.it>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -500,7 +500,7 @@ msgstr "Acknowledge" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Con acknowledge" @@ -599,7 +599,7 @@ msgstr "L'azione \"%1$s\" esiste già." msgid "Action \"%1$s\" no operations defined." msgstr "L'azione \"%1$s\" non ha operazioni definite." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -725,7 +725,7 @@ msgstr "Attivo fino a" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -736,7 +736,7 @@ msgstr "Attivo fino a" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -992,7 +992,7 @@ msgstr "Periodo inferiore a" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1314,7 +1314,7 @@ msgstr "Alle (ore:minuti)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1323,8 +1323,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1335,6 +1335,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1346,7 +1351,7 @@ msgstr "Creare almeno un intervallo di manutenzione." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1432,7 +1437,7 @@ msgstr "Autenticazione" msgid "Authentication algorithm" msgstr "Algoritmo di autenticazione" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1481,7 +1486,7 @@ msgstr "" msgid "Auto-login" msgstr "Auto-login" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Le opzioni Auto-login e auto-logout non possono essere abilitate insieme." @@ -1492,7 +1497,7 @@ msgstr "Auto-logout" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1751,7 +1756,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1786,7 +1791,7 @@ msgstr "Callback" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1992,7 +1997,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2114,7 +2119,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Impossibile rimuovere utente interno Zabbix \"%1$s\", prova a disabilitare quell'utente." @@ -2123,7 +2128,7 @@ msgstr "Impossibile rimuovere utente interno Zabbix \"%1$s\", prova a disabilita msgid "Cannot delete action" msgstr "Impossibile cancellare l'azione" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2191,7 +2196,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2262,7 +2267,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "Impossibile rimuovere il proxy" msgstr[1] "Impossibile rimuovere il proxy" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2285,7 +2290,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "Impossibile rimuovere lo script" msgstr[1] "Impossibile rimuovere lo script" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Impossibile rimuovere gli script. Lo script \"%1$s\" e' utilizzato nell'operazione \"%2$s\" dell'azione." @@ -2679,16 +2684,16 @@ msgstr "Impossibile trovare il valore mappa \"%1$s\" utilizzato per il item prot msgid "Cannot have empty visible template name." msgstr "Impossibile avere il nome template vuoto." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2701,7 +2706,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "Non e' possibile importare il template \"%1$s\", template collegato \"%2$s\" inesistente." msgstr[1] "Non e' possibile importare il template \"%1$s\", template collegati \"%2$s\" inesistenti." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Impossibile inserire espressione trigger" @@ -2722,7 +2727,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2784,7 +2789,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Impossibile leggere risposta, controlla connessione al server Zabbix \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Impossibile rinominare utente guest." @@ -2867,7 +2872,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Impossibile scollegare e pulire scenari Web." @@ -2880,7 +2885,7 @@ msgstr "Impossibile scollegare template" msgid "Cannot unlink template." msgstr "Impossibile scollegare template." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2942,9 +2947,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Impossibile aggiornare un grafico discoverato." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Impossibile aggionrare un gruppo host discoverato." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3003,9 +3009,7 @@ msgstr "Impossibile aggiornare il grafico prototipo" msgid "Cannot update group" msgstr "Impossibile aggiornare il gruppo" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Impossibile aggiornare gruppi per l'host discoverato \"%1$s\"." @@ -3088,12 +3092,12 @@ msgstr "Impossibile aggiornare la mappa di rete" msgid "Cannot update proxy" msgstr "Impossibile aggiornare il proxy" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Impossibile aggiornare proxy per l'host discoverato \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3113,9 +3117,9 @@ msgstr "" msgid "Cannot update script" msgstr "Impossibile aggiornare lo script" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3298,8 +3302,8 @@ msgid "Character string not included" msgstr "Stringa di caratteri non inclusa" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3475,7 +3479,7 @@ msgstr "Orologio" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3513,13 +3517,13 @@ msgstr "Chiudi" msgid "Close expression constructor" msgstr "Chiudi costruttore di espressioni" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Chiudi nuovo evento" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Chiudi vecchi eventi" @@ -3616,7 +3620,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "Sessioni concorrenti" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3627,11 +3631,6 @@ msgstr "Condizione" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "Condizione \"%2$s\" non è utilizzata nella formula \"%3$s\" per l'azione \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "Condizione \"%2$s\" non utilizzata nella formula \"%3$s\" per correlazione \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3647,11 +3646,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "Condizione \"%2$s\" non è utilizzata nella formula \"%3$s\" per l'azione \"%1$s\" non è definita." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "Condizione \"%2$s\" utilizzata nella formula \"%3$s\" per correlazione \"%1$s\" non è definita." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3843,7 +3837,7 @@ msgstr "Testo di conferma" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Complimenti! Hai installato con successo il frontend di Zabbix." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4045,12 +4039,11 @@ msgstr "Copia" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Correlazione" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "Correlazione \"%1$s\" già esistente." @@ -4078,16 +4071,6 @@ msgid_plural "Correlations enabled" msgstr[0] "Correlazione abilitata" msgstr[1] "Correlazioni abilitate" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "Correlazione con parametri mancanti: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "Nome correlazione non può essere vuoto." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Regola di Correlazione" @@ -4098,8 +4081,8 @@ msgstr "Correlazione aggiornata" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Conteggio" @@ -4471,7 +4454,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "Nome DNS" @@ -4746,8 +4729,8 @@ msgstr "Dic" msgid "December" msgstr "Dicembre" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4757,7 +4740,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4854,7 +4837,7 @@ msgstr "Ritardato di" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4904,7 +4887,7 @@ msgstr "Rimuovere e pulire il template? (Attenzione: tutti gli host collegati sa msgid "Delete current action?" msgstr "Rimuovere azione corrente?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Cancella attuale correlazione?" @@ -5202,7 +5185,7 @@ msgstr "" msgid "Dependencies" msgstr "Dipendenze" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Subordinato" @@ -5210,7 +5193,7 @@ msgstr "Subordinato" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5419,10 +5402,10 @@ msgstr "Disabilitare scenario web selezionato?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5505,7 +5488,7 @@ msgid "Discovery by proxy" msgstr "Discovery per proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Controllo discovery" @@ -5517,7 +5500,7 @@ msgstr "Controlli discovery" msgid "Discovery list" msgstr "Lista discovery" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Oggetto discovery" @@ -5617,7 +5600,7 @@ msgstr "Regola di discovery aggiornata" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5628,7 +5611,7 @@ msgstr "Regole di discovery" msgid "Discovery rules deleted" msgstr "Regole di discovery rimosse" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Stato discovery" @@ -5784,18 +5767,6 @@ msgstr "" msgid "Draw style" msgstr "Stile disegno" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "Duplicato \"%1$s\" valore \"%2$s\" per correlazione \"%3$s\"." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Duplicato \"%1$s\" valore \"%2$s\" for correlazione." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5808,11 +5779,6 @@ msgstr "Valore \"nome\" duplicato \"%1$s\" per la mappa." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5972,10 +5938,6 @@ msgstr "File chiave SSL vuoto per lo scenario web \"%1$s\"." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "ID correlazione vuoto." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6002,11 +5964,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6191,7 +6151,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6202,7 +6162,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6245,7 +6205,7 @@ msgid "English (en_US)" msgstr "Inglese (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6320,7 +6280,7 @@ msgid "Event correlation" msgstr "Correlazione eventi" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Regole correlazione eventi" @@ -6356,11 +6316,11 @@ msgid "Event name" msgstr "" # Need to find a better translation -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Coppia tag eventi" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Tipo evento" @@ -6696,7 +6656,6 @@ msgstr "Il campo \"%1$s\" non può essere impostato a NULL." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7064,7 +7023,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "L'espressione fornita non è una macro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "Global regular expression \"%1$s\" non esiste." @@ -7309,12 +7268,12 @@ msgstr "Griglia" msgid "Group" msgstr "Gruppo" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Il gruppo \"%1$s\" non può esser rimosso, perchè è utilizzato da un prototipo host." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "Gruppo \"%1$s\" non può essere cancellato , perché viene utilizzato in una condizione di correlazione ." @@ -7646,7 +7605,7 @@ msgstr[1] "Host" msgid "Host \"%1$s\" already exists." msgstr "L'host \"%1$s\" esiste già." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7654,7 +7613,7 @@ msgstr "L'host \"%1$s\" esiste già." msgid "Host \"%1$s\" cannot be without host group." msgstr "Host \"%1$s\" non può esistere senza un gruppo host" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7725,17 +7684,17 @@ msgstr[1] "Host abilitati" msgid "Host group" msgstr "Gruppo host" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Il gruppo host \"%1$s\" esiste già." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Il gruppo host \"%1$s\" non può esser rimosso, in quanto è utilizzato in uno script globale." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7749,9 +7708,9 @@ msgid "Host group label type" msgstr "Tipo etichetta gruppo host" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "Host group con ID \"%1$s\" non è disponibile." @@ -7767,8 +7726,8 @@ msgstr "Host group con ID \"%1$s\" non è disponibile." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7955,7 +7914,7 @@ msgstr "Host con nome visibile \"%1$s\" gia' presente." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8043,7 +8002,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "Indirizzo IP" @@ -8068,7 +8027,7 @@ msgstr "La gamma IP \"%1$s\" supera il limite di indirizzo \"%2$s\"" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8125,12 +8084,12 @@ msgstr "Evidenziazione icone" msgid "Icon map" msgstr "Mappa icone" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "La mappa icone \"%1$s\" non può esser rimossa. È utilizzata nella mappa \"%2$s\"." @@ -8154,7 +8113,7 @@ msgstr "Mappa icone aggiornata" msgid "Icon mapping" msgstr "Mappatura icone" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "L'icona con ID \"%1$s\" non è disponibile." @@ -8385,7 +8344,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8398,11 +8357,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8614,24 +8573,6 @@ msgstr "Gruppo utenti errato per l'operazione dell'azione. Il gruppo utenti non msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Utente errato per l'operazione dell'azione. L'utente non esiste o non accesso a questo utente.Utente errato per l'operazione dell'azione. L'utente non esiste o non accesso a questo utente." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8716,20 +8657,11 @@ msgstr "Condizione non corretta per l'azione \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Condizioni non corrette per la regola di discovery \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "ID di correlazione non corretta." - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "Espressione personalizzata non corretta \"%2$s\" per l'azione \"%1$s\": %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "Espressione personalizzata non corretta \"%2$s\" per la correlazione \"%1$s\": %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8794,12 +8726,6 @@ msgstr "Filtro errato \"condizione ID formula\" per azione \"%1$s\"." msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Filtro errato \"condizione ID formula\" per la regola di discovery \"%1$s\"." -# Not so much clear -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "ID formula per filtro condizione non corretto per la correlazione \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8907,7 +8833,7 @@ msgstr "ID mappa errato." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Metodo non corretto \"%1$s.%2$s\"." @@ -9021,11 +8947,6 @@ msgstr "Non corretta espressione prototipo trigger. Gli elementi di un prototipo msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Tipo non corretto di calcolo per l'azione \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "Tipo di calcolo non corretto per la correlazione \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9047,10 +8968,10 @@ msgstr "ID utente specificato errato per la mappa \"%1$s\"." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "ID gruppo utente specificato errato per la mappa \"%1$s\"." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9112,18 +9033,6 @@ msgstr "Valore \"%1$s\" errato per il campo int \"%2$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Valore \"%1$s\" errato per il campo int senza segno \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "Valore non corretto \"%1$s\" nel campo \"%2$s\" per la correlazione \"%3$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9185,12 +9094,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9302,7 +9205,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9313,9 +9216,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9466,7 +9369,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Inserisci" @@ -9594,7 +9497,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Intervallo" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9617,7 +9520,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "Action condition non valido: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9631,7 +9534,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9678,9 +9581,11 @@ msgstr "Parametri del metodo non validi." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9720,17 +9625,17 @@ msgstr "Parametri del metodo non validi." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9738,14 +9643,14 @@ msgstr "Parametri del metodo non validi." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9753,111 +9658,116 @@ msgstr "Parametri del metodo non validi." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10068,7 +9978,7 @@ msgstr[1] "Item disabilitato" msgid "Item in \"not supported\" state" msgstr "Item in stato \"non supportato\"" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Item non selezionato" @@ -10247,7 +10157,7 @@ msgstr "Item aggiornati" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10440,7 +10350,7 @@ msgstr "Posizione etichetta" msgid "Language" msgstr "Lingua" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11041,7 +10951,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11283,7 +11193,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "Il periodo di tempo massimo da visualizzare è \"%1$s\" giorno." msgstr[1] "Il periodo di tempo massimo da visualizzare è \"%1$s\" giorni." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11308,7 +11218,7 @@ msgstr "Supporti" msgid "Media type" msgstr "Tipi di supporto" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Media type \"%1$s\" già presente." @@ -11352,7 +11262,7 @@ msgstr "" msgid "Media type updated" msgstr "Tipo di supporto aggiornato" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "Tipo Media con ID \"%1$s\" non e' valido." @@ -11364,7 +11274,7 @@ msgstr "Tipo Media con ID \"%1$s\" non e' valido." msgid "Media types" msgstr "Tipi di supporto" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11611,7 +11521,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12013,15 +11923,17 @@ msgstr "" msgid "New element" msgstr "Nuovo elemento" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "Nuovo evento gruppo host" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Nuovo valore tag evento" @@ -12041,7 +11953,7 @@ msgstr "" msgid "New service time" msgstr "Nuovo orario di servizio" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12068,7 +11980,7 @@ msgstr "Prossimo step" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12097,30 +12009,6 @@ msgstr "Prossimo step" msgid "No" msgstr "No" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "Nessun \"%1$s\" fornito per la correlazione \"%2$s\"." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "Nessun \"%1$s\" fornito per la correlazione." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12170,11 +12058,6 @@ msgstr "Nessun nome utente di autenticazione specificato." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "Nessun tipo di condizione fornita per la correlazione \"%1$s\"." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12313,17 +12196,46 @@ msgstr "Nessuna corrispondenza trovata" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "Nessun tipo operazione fornita per la correlazione \"%1$s\"." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Nessun permesso per l'accesso al sistema." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12359,10 +12271,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12390,13 +12301,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12416,8 +12332,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12440,24 +12356,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12479,16 +12395,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12544,7 +12460,7 @@ msgstr "Nessun trigger definito." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Flag non booleani sono deprecati." @@ -12614,15 +12530,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Non autorizzato ad impostare la password per l'utente \"guest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12957,15 +12873,16 @@ msgstr "Off" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Vecchio valore tag evento" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12987,10 +12904,6 @@ msgstr "Una volta" msgid "One" msgstr "Uno" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Uno degli oggetti è rimasto senza gruppo host." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Solo una volta" @@ -13000,10 +12913,6 @@ msgstr "Solo una volta" msgid "One-time downtime" msgstr "Inattività una-volta" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Solo i Super Amministratori possono creare gruppi host." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Solo i check Zabbix agent, SNMPv1, SNMPv2 e SNMPv3 possono essere unici." @@ -13052,10 +12961,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Solo gli super admin possono creare correlazioni." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13064,10 +12969,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Solo gli super admin possono aggiornare le correlazioni." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Solo i trigger assegnati agli host abilitati e dipendenti da item abilitati son conteggiatiSolo i trigger assegnati agli host abilitati e dipendenti da item abilitati son conteggiati" @@ -13116,7 +13017,7 @@ msgstr "L'operazione non ha template per operare." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13125,33 +13026,33 @@ msgstr "" msgid "Operations" msgstr "Operazioni" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operatore" @@ -13560,16 +13461,16 @@ msgstr "" msgid "Parameter" msgstr "Parametro" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Parametro \"%1$s\" e' deprecato." @@ -13706,7 +13607,7 @@ msgstr "" msgid "Paste without external links" msgstr "Incolla senza link esterni" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13752,7 +13653,7 @@ msgstr "Esegue una query DNS. Restituisce una stringa di caratteri con le inform #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13885,7 +13786,7 @@ msgstr "Popola campo inventario host" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14205,7 +14106,7 @@ msgstr "Proxy" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14213,7 +14114,7 @@ msgstr "Proxy" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14223,12 +14124,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Il proxy \"%1$s\" per l'host \"%2$s\" non esiste." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Il proxy \"%1$s\" è usato dalla regola di discovery \"%2$s\"." @@ -14503,7 +14404,7 @@ msgstr "" msgid "Regular expression" msgstr "Espressione regolare" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14763,7 +14664,7 @@ msgid "Replace dependencies" msgstr "Sostituisci dipendenze" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14960,7 +14861,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Risultato" @@ -15201,7 +15102,7 @@ msgstr "SMTP server port" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15499,7 +15400,7 @@ msgstr "" msgid "Script" msgstr "Script" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Lo script \"%s\" esiste già." @@ -15613,7 +15514,7 @@ msgid "Security name" msgstr "Nome di sicurezza" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15828,11 +15729,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "L'ora di partenza del servizio deve essere minore dell'ora di fine." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15844,7 +15745,7 @@ msgstr "" msgid "Service times" msgstr "Orari servizio" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Tipo servizio" @@ -15857,7 +15758,7 @@ msgstr "" msgid "Service updated" msgstr "Servizio aggiornato" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15869,7 +15770,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15887,9 +15788,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Sessione terminata, rieffettua il login, per favore." @@ -15951,7 +15852,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16796,10 +16697,10 @@ msgstr "La tavola \"%1$s\" non contiene un campo chiamato \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Tag" @@ -16936,7 +16837,7 @@ msgstr "Template" msgid "Template \"%1$s\" already exists." msgstr "Il template \"%1$s\" esiste già." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17020,7 +16921,7 @@ msgstr "Template con stesso nome visibile \"%1$s\" gia' presente." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17317,7 +17218,7 @@ msgstr "Fino a" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17724,7 +17625,7 @@ msgstr "Trigger aggiornato" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17788,9 +17689,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17800,7 +17701,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17852,7 +17753,7 @@ msgstr "Tipo di informazione" msgid "Types" msgstr "Tipi" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17923,8 +17824,8 @@ msgstr "URL deve avere entrambe i campi \"nome\" e \"url\" per la mappa \"%1$s\" msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18034,21 +17935,23 @@ msgstr "Unità" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Sconosciuto" @@ -18066,7 +17969,7 @@ msgid "Unknown error" msgstr "Errore sconosciuto" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Item host sconosciuto, nessun item di questo tipo nell'host selezionato" @@ -18205,7 +18108,7 @@ msgstr "Su" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18339,37 +18242,37 @@ msgstr "Utilizzato nelle azioni" msgid "User" msgstr "Utente" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "L'utente \"%1$s\" non può esistere senza un gruppo utenti" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "Utente \"%1$s\" e' il proprietario della mappa \"%2$s\"." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "Utente \"%1$s\" e' utilizzato nell'azione \"%2$s\"." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18391,13 +18294,13 @@ msgstr "Utente aggiunto" msgid "User agent string" msgstr "Stringa user agent" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "L'utente non può aggiungere se stesso ad un gruppo disabilitato o ad un gruppo con accesso alla GUI disabilitato.L'utente non può aggiungere se stesso ad un gruppo disabilitato o ad un gruppo con accesso alla GUI disabilitato." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18421,27 +18324,27 @@ msgstr[1] "" msgid "User group" msgstr "Gruppo utenti" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Gruppo utenti \"%1$s\" gia' presente." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "Gruppo utenti \"%1$s\" viene utilizzato nell'azione \"%2$s\"." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Gruppo utente \"%1$s\" e' configurato per ricevere le segnalazioni di database down." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Il gruppo utenti \"%1$s\" è utilizzato nello script \"%2$s\"." @@ -18475,9 +18378,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "Gruppo utenti con ID \"%1$s\" non è disponibile." @@ -18492,7 +18395,7 @@ msgstr "Gruppo utenti con ID \"%1$s\" non è disponibile." msgid "User groups" msgstr "Gruppi utenti" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "L'utente non ha i permessi per cancellare se stesso." @@ -18527,7 +18430,7 @@ msgstr "Profilo utente" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18546,7 +18449,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18596,12 +18499,12 @@ msgstr "Utente aggiornato" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "L'utente con ID \"%1$s\" non è disponibile." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18912,14 +18815,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19031,11 +18934,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Valore di qualsiasi Windows performance counter. Restituisce integer, float, string o testo (a seconda della richiesta)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19572,7 +19476,7 @@ msgstr "Per anni" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19629,7 +19533,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19762,11 +19665,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "è previsto un booleano" @@ -19774,16 +19677,16 @@ msgstr "è previsto un booleano" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "E' prevista una stringa di caratteri" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19792,37 +19695,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "è previsto un numero" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "un numero è troppo grande" @@ -19843,7 +19746,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19851,19 +19754,19 @@ msgstr "" msgid "a time is expected" msgstr "è previsto un orario" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "è previsto un periodo di tempo" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19913,7 +19816,7 @@ msgstr "tutti" msgid "all media" msgstr "tutti i supporti" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19935,23 +19838,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "è previsto un array di dati" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19961,7 +19864,7 @@ msgid "an empty string is expected" msgstr "è prevista una stringa vuota" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "E' previsto un numero pari di caratteri esadecimali" @@ -19969,11 +19872,15 @@ msgstr "E' previsto un numero pari di caratteri esadecimali" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20134,13 +20041,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20171,13 +20072,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20195,14 +20096,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20275,7 +20176,8 @@ msgid "configure" msgstr "configura" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20366,7 +20268,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20388,13 +20290,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20420,7 +20322,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20457,7 +20360,7 @@ msgstr "l'espressione e' vuota" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20548,7 +20451,7 @@ msgstr "icona" msgid "image" msgstr "immagine" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20593,15 +20496,19 @@ msgstr "Conteggio elemento errato" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "Sintassi non corretta in \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20629,7 +20536,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "Intervallo di indirizzi non valido \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "Sequenza di byte non valida in UTF-8" @@ -20658,27 +20565,27 @@ msgstr "" msgid "invalid history storage period" msgstr "Periodo di storicizzazione History non valido" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "regular expression non valida" @@ -20706,7 +20613,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "non è racchiuso in {} o è malformato" @@ -20856,7 +20763,7 @@ msgstr "corrispondenze" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20896,7 +20803,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "lunghezza carattari minima è %1$s" @@ -20923,8 +20830,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20945,8 +20852,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21162,6 +21069,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21207,11 +21118,11 @@ msgstr "" msgid "regular expression" msgstr "regular expression" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21223,15 +21134,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21279,7 +21190,7 @@ msgstr "" msgid "short description" msgstr "breve descrizione" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21298,15 +21209,15 @@ msgstr "breve descrizione" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "dovrebbe essere vuoto" @@ -21322,31 +21233,31 @@ msgstr "mostra mappature icone" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21354,15 +21265,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21375,7 +21286,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21386,7 +21297,7 @@ msgstr "" msgid "tag" msgstr "tag" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21395,14 +21306,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "L'ID template \"%1$s\" è passato %2$s volte" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21414,20 +21325,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "il parametro \"%1$s\" è mancante" @@ -21459,7 +21370,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21467,31 +21378,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21505,7 +21416,7 @@ msgstr "trigger" msgid "trigger does not allow manual closing" msgstr "il trigger non permette la chiusura manuale" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21517,11 +21428,11 @@ msgstr "trigger prototipo non può essere spostato in un altro template o host" msgid "trigger with linkages cannot be moved to another template or host" msgstr "trigger con collegamenti non può essere spostato ad un altro template o host" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21530,7 +21441,7 @@ msgstr "" msgid "type here to search" msgstr "digita qui per cercare" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21578,11 +21489,12 @@ msgstr "Fine della macro non valida" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "parametro inaspettato \"%1$s\"" @@ -21608,8 +21520,8 @@ msgstr "valore testo non previsto \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21634,6 +21546,10 @@ msgstr "" msgid "unsupported version number" msgstr "numero versione non supportata" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21691,61 +21607,69 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "valore %1$s già esistente" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "valore troppo lungo" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21776,15 +21700,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "il valore deve essere uno di %1$s" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21793,7 +21715,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21806,11 +21728,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/ja/LC_MESSAGES/frontend.po b/ui/locale/ja/LC_MESSAGES/frontend.po index 66f47fff508..08071889d6f 100644 --- a/ui/locale/ja/LC_MESSAGES/frontend.po +++ b/ui/locale/ja/LC_MESSAGES/frontend.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: Zabbix 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-08 19:55+0300\n" -"PO-Revision-Date: 2021-10-06 13:15+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" +"PO-Revision-Date: 2021-10-12 13:34+0300\n" "Last-Translator: Atsushi <a.tanaka77@gmail.com>\n" "Language-Team: Zabbix\n" "Language: ja\n" @@ -13,7 +13,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.5.1.3\n" "X-Poedit-Basepath: ../../\n" -"X-POOTLE-MTIME: 1633518915.000000\n" +"X-POOTLE-MTIME: 1634038464.000000\n" #: include/classes/db/MysqlDbBackend.php:70 #: include/classes/db/OracleDbBackend.php:142 @@ -480,7 +480,7 @@ msgstr "障害確認" msgid "Acknowledge problems" msgstr "障害の確認" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "確認済" @@ -579,7 +579,7 @@ msgstr "アクション\"%1$s\"はすでに存在しています。" msgid "Action \"%1$s\" no operations defined." msgstr "アクション\"%1$s\"に実行内容が設定されていません。" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "アクション\"%2$s\"はユーザーの役割\"%1$s\"に使用てきません。" @@ -703,7 +703,7 @@ msgstr "設定有効期間の終了日時" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -714,7 +714,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -970,7 +970,7 @@ msgstr "表示期間" msgid "Age less than %1$s" msgstr "表示期間 %1$s" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1247,7 +1247,7 @@ msgstr "計算" #: include/classes/helpers/CServiceHelper.php:148 msgid "As is" -msgstr "" +msgstr "そのまま" #: include/views/monitoring.history.php:102 msgid "As plain text" @@ -1292,7 +1292,7 @@ msgstr "開始時刻 (時:分)" msgid "At least one UI element must be checked." msgstr "少なくとも1つのUI要素をチェックしてください。" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "ユーザーの役割\"%1$s\"のために少なくとも1つのUI要素を有効にしてください。" @@ -1301,8 +1301,8 @@ msgstr "ユーザーの役割\"%1$s\"のために少なくとも1つのUI要素 msgid "At least one action is mandatory." msgstr "少なくとも1つのアクションが必要です。" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "少なくとも1人の有効なユーザーを役割\"%1$s\"と共に指定してください。" @@ -1313,6 +1313,11 @@ msgstr "少なくとも1人の有効なユーザーを役割\"%1$s\"と共に指 msgid "At least one host group or host must be selected." msgstr "少なくとも1つのホストグループまたはホストが選択されている必要があります。" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1324,7 +1329,7 @@ msgstr "少なくとも1つ以上のメンテナンス期間を作成する必 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "少なくともMySQL、PostgreSQL、Oracleのうち1つ以上をサポートする必要があります。" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "少なくとも1つ以上の実行内容が選択されている必要があります。" @@ -1410,7 +1415,7 @@ msgstr "認証" msgid "Authentication algorithm" msgstr "認証アルゴリズム" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "認証に失敗しました：%1$s。" @@ -1459,7 +1464,7 @@ msgstr "自動" msgid "Auto-login" msgstr "自動ログイン (1ヶ月)" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "自動ログインと自動ログアウトを同時に有効にすることはできません。" @@ -1470,7 +1475,7 @@ msgstr "自動ログアウト" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1729,7 +1734,7 @@ msgstr "CRLF" msgid "CSV to JSON" msgstr "CSVからJSON" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "CUIDで指定してください" @@ -1764,7 +1769,7 @@ msgstr "コールバック" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1969,7 +1974,7 @@ msgstr "LDAPサーバーにバインドできません。" msgid "Cannot build expression tree: %1$s." msgstr "条件式ツリーを作成できません： %1$s。" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "自身の役割のユーザーの種類を変更できません。" @@ -2087,7 +2092,7 @@ msgid "Cannot delete API token" msgid_plural "Cannot delete API tokens" msgstr[0] "APIトークンを削除できません" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Zabbixユーザー\"%1$s\"を削除できません。ユーザーを無効に設定してください。" @@ -2096,7 +2101,7 @@ msgstr "Zabbixユーザー\"%1$s\"を削除できません。ユーザーを無 msgid "Cannot delete action" msgstr "アクションを削除できません" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "割り当てられたユーザーの役割\"%1$s\"が削除できません。" @@ -2157,7 +2162,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group." msgstr[0] "メンテナンス\"%1$s\"は少なくとも1つのホストかホストグループが必要なのでホストを削除できません。" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2224,7 +2229,7 @@ msgid "Cannot delete proxy" msgid_plural "Cannot delete proxies" msgstr[0] "プロキシを削除できません" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "読み込み専用のユーザーの役割\"%1$s\"を削除できません。" @@ -2244,7 +2249,7 @@ msgid "Cannot delete script" msgid_plural "Cannot delete scripts" msgstr[0] "スクリプトを削除できません" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "スクリプトを削除できません。スクリプト\"%1$s\"は実行するアクション\"%2$s\"に使用されています。" @@ -2611,16 +2616,16 @@ msgstr "\"%4$s\"上のディスカバリルール\"%3$s\"のアイテムのプ msgid "Cannot have empty visible template name." msgstr "テンプレート表示名に空白は設定できません。" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2632,7 +2637,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist. msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist." msgstr[0] "テンプレート\"%1$s\"をインポートできません。リンクされているテンプレート\"%2$s\"が存在しません。" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "トリガー条件式を追加できません" @@ -2652,7 +2657,7 @@ msgid "Cannot load module at: %1$s." msgid_plural "Cannot load modules at: %1$s." msgstr[0] "%1$sにあるモジュールをロードできません。" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "ログアウトできません。" @@ -2714,7 +2719,7 @@ msgstr "YAML: %1$sが読み込めません。" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "レスポンスを読めません。Zabbixサーバー\"%1$s\"との接続を確認してください。" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "ゲストユーザーの名前は変更できません。" @@ -2796,7 +2801,7 @@ msgid "Cannot unblock user" msgid_plural "Cannot unblock users" msgstr[0] "ユーザーのブロック解除ができません" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Webシナリオのリンク削除と削除が行えません。" @@ -2809,7 +2814,7 @@ msgstr "テンプレートのリンクを削除できません" msgid "Cannot unlink template." msgstr "テンプレートのリンクを削除できません。" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "トリガー\"%1$s\"のリンクを削除できません。ホストにリンクされたテンプレートのアイテムを使用しています。" @@ -2871,9 +2876,10 @@ msgstr "APIトークンを更新できません" msgid "Cannot update a discovered graph." msgstr "ディスカバリされたグラフを更新できません。" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "ディスカバリされたホストグループを更新できません。" +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -2931,9 +2937,7 @@ msgstr "グラフのプロトタイプを更新できません" msgid "Cannot update group" msgstr "グループを更新できません" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "ディスカバリされたホスト\"%1$s\"のグループを更新できません。" @@ -3014,12 +3018,12 @@ msgstr "ネットワークマップを更新できません" msgid "Cannot update proxy" msgstr "プロキシを更新できません" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "ディスカバリされたホスト\"%1$s\"のプロキシを更新できません。" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "読み込み専用のユーザーの役割\"%1$s\"を更新できません。" @@ -3039,9 +3043,9 @@ msgstr "定期レポートを更新できません" msgid "Cannot update script" msgstr "スクリプトを更新できません" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "スクリプトの範囲を更新できません。\"%1$s\"はアクション\"%2$s\"で使用されています。" @@ -3222,8 +3226,8 @@ msgid "Character string not included" msgstr "文字列が含まれない" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "文字" @@ -3399,7 +3403,7 @@ msgstr "時刻" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3437,13 +3441,13 @@ msgstr "閉じる" msgid "Close expression constructor" msgstr "条件式ビルダーを閉じる" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "新しいイベントのクローズ" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "古いイベントのクローズ" @@ -3540,7 +3544,7 @@ msgstr "圧縮" msgid "Concurrent sessions" msgstr "並列実行数" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3551,11 +3555,6 @@ msgstr "トリガー条件式" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "アクション\"%1$s\"の条件\"%2$s\"は式\"%3$s\"内で使用されていません。" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "相関関係\"%1$s\"の条件\"%2$s\"は式\"%3$s\"内で使用されていません。" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3571,11 +3570,6 @@ msgstr "\"%1$s\"を上書きするための条件\"%2$s\"が式\"%3$s\"内で使 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "アクション\"%1$s\"の式\"%3$s\"内で使用されている条件\"%2$s\"は設定されていません。" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "相関関係\"%1$s\"の式\"%3$s\"で使用されている条件\"%2$s\"は設定されていません。" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3767,7 +3761,7 @@ msgstr "確認テキスト" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "おめでとうございます！Webインターフェースのインストールが終了しました。" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -3980,12 +3974,11 @@ msgstr "コピー" msgid "Copy to clipboard" msgstr "クリップボードにコピー" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "相関関係" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "相関関係\"%1$s\"はすでに存在しています。" @@ -4009,16 +4002,6 @@ msgid "Correlation enabled" msgid_plural "Correlations enabled" msgstr[0] "相関関係を有効にしました" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "相関関係がパラメータに設定されていません: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "相関関係名は必須項目です。" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "相関関係ルール" @@ -4029,8 +4012,8 @@ msgstr "相関関係を更新しました" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "カウント" @@ -4402,7 +4385,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS名" @@ -4676,8 +4659,8 @@ msgstr "12月" msgid "December" msgstr "12月" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "小数点以下桁数" @@ -4687,7 +4670,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4784,7 +4767,7 @@ msgstr "遅延時間" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4834,7 +4817,7 @@ msgstr "テンプレートとデータを削除しますか？(警告: リンク msgid "Delete current action?" msgstr "現在のアクションを削除しますか？" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "現在の相関関係を削除しますか？" @@ -5132,7 +5115,7 @@ msgstr "拒否リスト" msgid "Dependencies" msgstr "依存関係" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "依存先" @@ -5140,7 +5123,7 @@ msgstr "依存先" msgid "Dependent item" msgstr "依存アイテム" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5349,10 +5332,10 @@ msgstr "選択したWebシナリオを無効にしますか？" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5435,7 +5418,7 @@ msgid "Discovery by proxy" msgstr "プロキシによるディスカバリ" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "ディスカバリチェック" @@ -5447,7 +5430,7 @@ msgstr "ディスカバリチェック" msgid "Discovery list" msgstr "ディスカバリリスト" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "ディスカバリオブジェクト" @@ -5543,7 +5526,7 @@ msgstr "ディスカバリのルールを更新しました" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5554,7 +5537,7 @@ msgstr "ディスカバリルール" msgid "Discovery rules deleted" msgstr "ディスカバリのルールを削除しました" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "ディスカバリのステータス" @@ -5710,18 +5693,6 @@ msgstr "グラフの形式" msgid "Draw style" msgstr "グラフの形式" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "相関関係\"%3$s\"の\"%1$s\"の値\"%2$s\"が重複しています。" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "相関関係の\"%1$s\"の値\"%2$s\"が重複しています。" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5732,12 +5703,7 @@ msgstr "マップのための\"name\"の値\"%1$s\"が重複しています。" #: include/classes/api/services/CMap.php:1285 #, c-format msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" +msgstr "マップ\"%2$s\"のユーザーグループ内の\"usrgrpid\" \"%1$s\"が重複しています。" #: include/classes/api/services/CTrigger.php:1142 #, c-format @@ -5898,10 +5864,6 @@ msgstr "Webシナリオ\"%1$s\"のためのSSL秘密鍵ファイルが空白で msgid "Empty color." msgstr "色が指定されていません。" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "相関関係IDが空白です。" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -5928,11 +5890,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "アクション\"%1$s\"のフィルター条件タイプが空白です。" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6117,7 +6077,7 @@ msgstr "トラッピングの有効化" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6128,7 +6088,7 @@ msgstr "トラッピングの有効化" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6171,7 +6131,7 @@ msgid "English (en_US)" msgstr "英語 (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6246,7 +6206,7 @@ msgid "Event correlation" msgstr "イベント相関関係" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "イベント相関関係ルール" @@ -6281,11 +6241,11 @@ msgstr "イベントログの監視。ログ値を返す。" msgid "Event name" msgstr "イベント名" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "イベントタグのペア" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "イベントタイプ" @@ -6620,7 +6580,6 @@ msgstr "フィールド\"%1$s\"はNULLに設定できません。" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -6810,7 +6769,7 @@ msgstr "固定" #: include/classes/helpers/CServiceHelper.php:152 msgid "Fixed status" -msgstr "" +msgstr "固定ステータス" #: app/views/js/popup.massupdate.tmpl.js.php:81 #: app/views/popup.lldoperation.php:124 @@ -6988,7 +6947,7 @@ msgstr "ホストから値を取得" msgid "Given expression is not a macro" msgstr "設定した条件式はマクロではありません" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "グローバルな正規表現\"%1$s\"は存在しません。" @@ -7076,7 +7035,7 @@ msgstr "グラフ\"%1$s\"は\"%2$s\"にすでに存在します (アイテムは #: include/classes/api/services/CGraphGeneral.php:1135 #, c-format msgid "Graph \"%1$s\" already exists on \"%2$s\" as a graph created from graph prototype." -msgstr "" +msgstr "グラフ\"%1$s\"はグラフプロトタイプとして作成されたグラフとして\"%2$s\"上に存在します。" #: include/classes/api/services/CGraphGeneral.php:1038 #: include/classes/api/services/CGraphGeneral.php:1246 @@ -7232,12 +7191,12 @@ msgstr "グリッド" msgid "Group" msgstr "グループ" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "ホストのプロトタイプで使用されているためグループ\"%1$s\"は削除できません。" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "相関関係の条件で使用されているためグループ\"%1$s\"は削除できません。" @@ -7480,7 +7439,7 @@ msgstr "圧縮が有効になっているのでヒストリのクリーンアッ #: app/controllers/CControllerAuditLogList.php:198 msgid "History clear" -msgstr "" +msgstr "ヒストリ削除" #: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038 msgid "History cleared" @@ -7567,7 +7526,7 @@ msgstr[0] "ホスト" msgid "Host \"%1$s\" already exists." msgstr "ホスト\"%1$s\"はすでに存在しています。" -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7575,7 +7534,7 @@ msgstr "ホスト\"%1$s\"はすでに存在しています。" msgid "Host \"%1$s\" cannot be without host group." msgstr "ホスト\"%1$s\"にホストグループを設定してください。" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "ホスト\"%1$s\"はプロキシ\"%2$s\"によって監視されています。" @@ -7644,17 +7603,17 @@ msgstr[0] "ホストを有効にしました" msgid "Host group" msgstr "ホストグループ" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "ホストグループ\"%1$s\"はすでに存在しています。" -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "グローバルスクリプトに使用されているためホストグループ\"%1$s\"を削除できません。" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "ホストグループ\"%1$s\"は組み込まれたグループなので削除できません。" @@ -7668,9 +7627,9 @@ msgid "Host group label type" msgstr "ホストグループのラベルタイプ" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "ID \"%1$s\"のホストグループは使用できません。" @@ -7686,8 +7645,8 @@ msgstr "ID \"%1$s\"のホストグループは使用できません。" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7873,7 +7832,7 @@ msgstr "同じホストの表示名\"%1$s\"を持つホストがすでに存在 #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -7961,7 +7920,7 @@ msgstr "IPアドレス" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IPアドレス" @@ -7986,7 +7945,7 @@ msgstr "IPアドレスの範囲\"%1$s\"がアドレスの制限\"%2$s\"を超え #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8043,12 +8002,12 @@ msgstr "アイコンのハイライト" msgid "Icon map" msgstr "アイコンのマッピング" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "アイコンのマッピング\"%1$s\"はすでに存在します。" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "アイコンのマッピング\"%1$s\"を削除できません。マップ\"%2$s\"に使用されています。" @@ -8072,7 +8031,7 @@ msgstr "アイコンのマッピングを更新しました" msgid "Icon mapping" msgstr "アイコンのマッピング" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "ID \"%1$s\"のアイコンは使用できません。" @@ -8173,7 +8132,7 @@ msgstr "Iframeサンドボックスの例外" #: include/classes/helpers/CServiceHelper.php:151 msgid "Ignore this service" -msgstr "" +msgstr "このサービスを無視" #: app/controllers/CControllerAuditLogList.php:223 #: app/views/administration.image.edit.php:60 @@ -8301,7 +8260,7 @@ msgstr "アクセスできないアイテムのプロトタイプ" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8314,11 +8273,11 @@ msgstr "アクセスできないマップ" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "アクセスできないテンプレート" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "アクセスできないトリガー" @@ -8530,24 +8489,6 @@ msgstr "実行するアクションのユーザーグループの値が正しく msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "実行するアクションのユーザーの値が正しくありません。ユーザーが存在しないか、アクセス権がありません。" -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8632,20 +8573,11 @@ msgstr "アクション\"%1$s\"の条件式が正しくありません。" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "ディスカバリルール\"%1$s\"の条件式が正しくありません。" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "相関関係IDが正しくありません。" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "アクション\"%1$s\"のカスタム条件式\"%2$s\"が正しくありません： %3$s。" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "相関関係\"%1$s\"のカスタム条件式\"%2$s\"が正しくありません: %3$s。" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8710,11 +8642,6 @@ msgstr "アクション\"%1$s\"のフィルター条件式IDが正しくあり msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "ディスカバリルール\"%1$s\"のフィルター条件式IDが正しくありません。" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "相関関係\"%1$s\"のフィルター条件式IDが正しくありません。" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8822,7 +8749,7 @@ msgstr "マップIDが正しくありません。" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "メソッド\"%1$s.%2$s\"が正しくありません。" @@ -8936,11 +8863,6 @@ msgstr "トリガーのプロトタイプの条件式が正しくありません msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "アクション\"%1$s\"の計算のタイプが正しくありません。" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "相関関係\"%1$s\"の計算タイプが正しくありません。" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -8962,10 +8884,10 @@ msgstr "マップ\"%1$s\"の指定されたユーザーIDが正しくありま msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "マップ\"%1$s\"の指定されたユーザーグループIDが正しくありません。" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "不正なユーザー名やパスワードまたはアカウントは一時的にブロックされます。" @@ -9027,18 +8949,6 @@ msgstr "整数フィールド\"%2$s\"の値\"%1$s\"が正しくありません msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "符号なし整数フィールド\"%2$s\"の値\"%1$s\"が正しくありません。" -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "相関関係\"%3$s\"のフィールド\"%2$s\"の値\"%1$s\"が正しくありません。" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9100,12 +9010,6 @@ msgstr "\"%1$s\"フィールドのための値が正しくありません。" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9217,7 +9121,7 @@ msgstr "\"%1$s\"フィールドのための値が正しくありません。" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9228,9 +9132,9 @@ msgstr "\"%1$s\"フィールドのための値が正しくありません。" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9381,7 +9285,7 @@ msgstr "継承したタグとトリガータグ" msgid "Inherited items" msgstr "継承したアイテム" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "挿入" @@ -9509,7 +9413,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "監視間隔" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "ユーザーの役割\"%1$s\"のためのAPIメソッド\"%2$s\"が正しくありません。" @@ -9532,7 +9436,7 @@ msgstr "YAMLファイルの内容が正しくありません" msgid "Invalid action condition: %1$s." msgstr "アクションの実行条件が正しくありません：%1$s。" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "条件が正しくありません： %1$s。" @@ -9546,7 +9450,7 @@ msgstr "日付が正しくありません。" msgid "Invalid email address \"%1$s\"." msgstr "メールアドレス\"%1$s\"が正しくありません。" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "ID \"%1$s\"のメディアタイプのメールアドレスが正しくありません。" @@ -9593,9 +9497,11 @@ msgstr "メソッドのパラメータが正しくありません。" #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9635,17 +9541,17 @@ msgstr "メソッドのパラメータが正しくありません。" #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9653,14 +9559,14 @@ msgstr "メソッドのパラメータが正しくありません。" #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9668,111 +9574,116 @@ msgstr "メソッドのパラメータが正しくありません。" #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -9980,7 +9891,7 @@ msgstr[0] "アイテムを有効にしました" msgid "Item in \"not supported\" state" msgstr "アイテムが\"取得不可\"の状態" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "アイテムが選択されていません" @@ -10158,7 +10069,7 @@ msgstr "アイテムを更新しました" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10351,7 +10262,7 @@ msgstr "ラベルの位置" msgid "Language" msgstr "言語" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "言語\"%1$s\"はサポートしていません。" @@ -10946,7 +10857,7 @@ msgstr "定期レポートの管理" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11187,7 +11098,7 @@ msgid "Maximum time period to display is %1$s day." msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "表示できる最大の期間は%1$s日です。" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "ID \"%1$s\"のメディアタイプのメールアドレスが最大長を超えています。" @@ -11212,7 +11123,7 @@ msgstr "メディア" msgid "Media type" msgstr "メディアタイプ" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "メディアタイプ\"%1$s\"はすでに存在しています。" @@ -11253,7 +11164,7 @@ msgstr "メディアタイプのテストに成功しました。" msgid "Media type updated" msgstr "メディアタイプを更新しました" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "ID \"%1$s\"のメディアタイプは使用できません。" @@ -11265,7 +11176,7 @@ msgstr "ID \"%1$s\"のメディアタイプは使用できません。" msgid "Media types" msgstr "メディアタイプ" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "メディアタイプはアクション\"%1$s\"に利用されています。" @@ -11507,7 +11418,7 @@ msgstr[0] "モジュールを有効にしました: %1$s。" msgid "Module updated: %1$s." msgstr "モジュールを更新しました： %1$s。" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -11595,11 +11506,11 @@ msgstr "ホストに\"%1$s\"の名前を持つグラフが1つ以上存在しま #: include/classes/helpers/CServiceHelper.php:27 msgid "Most critical if all children have problems" -msgstr "" +msgstr "すべての子が障害であったときにもっとも重要" #: include/classes/helpers/CServiceHelper.php:26 msgid "Most critical of child services" -msgstr "" +msgstr "子サービスでもっとも重要" #: include/httptest.inc.php:409 msgid "Mozilla Firefox" @@ -11625,14 +11536,14 @@ msgstr "私が作成" #: include/classes/helpers/CServiceHelper.php:37 #: include/classes/helpers/CServiceHelper.php:47 msgid "N" -msgstr "" +msgstr "N" #: include/classes/helpers/CServiceHelper.php:42 #: include/classes/helpers/CServiceHelper.php:52 #: include/classes/helpers/CServiceHelper.php:62 #: include/classes/helpers/CServiceHelper.php:72 msgid "N%" -msgstr "" +msgstr "N%" #: include/discovery.inc.php:53 msgid "NNTP" @@ -11892,7 +11803,7 @@ msgstr "未監視" #: app/views/popup.service.statusrule.edit.php:94 msgid "New additional rule" -msgstr "" +msgstr "新規追加ルール" #: app/controllers/CControllerPopupConditionActions.php:94 #: app/controllers/CControllerPopupConditionEventCorr.php:87 @@ -11909,15 +11820,17 @@ msgstr "新規ダッシュボード" msgid "New element" msgstr "新規要素" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "新しいイベントのホストグループ" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "新しいイベントタグ名" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "新しいイベントタグの値" @@ -11937,7 +11850,7 @@ msgstr "新規サービス" msgid "New service time" msgstr "新規サービスタイム" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "新しいタグ名" @@ -11964,7 +11877,7 @@ msgstr "次のステップ" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -11993,30 +11906,6 @@ msgstr "次のステップ" msgid "No" msgstr "いいえ" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "相関関係\"%2$s\"に\"%1$s\"が定義されていません。" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "相関関係に\"%1$s\"が定義されていません。" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12066,11 +11955,6 @@ msgstr "認証ユーザー名が設定されていません。" msgid "No changes." msgstr "変更はありません。" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "相関関係\"%1$s\"に条件のタイプが定義されていません。" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12131,7 +12015,7 @@ msgstr "ファイルがアップロードされていません。" #: include/graphs.inc.php:153 #, c-format msgid "No graph item with graph ID \"%1$s\"." -msgstr "" +msgstr "グラフID\"%1$s\"のグラフアイテムが存在しません。" #: app/views/monitoring.widget.favgraphs.view.php:26 msgid "No graphs added." @@ -12144,7 +12028,7 @@ msgstr "ホストIDが存在しません。" #: include/hosts.inc.php:515 #, c-format msgid "No host groups with group ID \"%1$s\"." -msgstr "" +msgstr "グループID\"%1$s\"のホストグループが存在しません。" #: app/controllers/CControllerWidgetUrlView.php:51 msgid "No host selected." @@ -12153,7 +12037,7 @@ msgstr "ホストが選択されていません。" #: include/hosts.inc.php:558 #, c-format msgid "No host with host ID \"%1$s\"." -msgstr "" +msgstr "ホストID\"%1$s\"のホストが存在しません。" #: include/classes/api/services/CMapElement.php:176 #, c-format @@ -12186,7 +12070,7 @@ msgstr "実行するアクションのインベントリモードが設定され #: include/items.inc.php:742 #, c-format msgid "No item with item ID \"%1$s\"." -msgstr "" +msgstr "アイテムID\"%1$s\"のアイテムが存在しません。" #: chart3.php:145 chart7.php:56 msgid "No items defined." @@ -12209,17 +12093,46 @@ msgstr "条件に一致するデータはありません" msgid "No new modules discovered" msgstr "新しいモジュールは見つかりませんでした" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "相関関係\"%1$s\"に実行内容のタイプが定義されていません。" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "システムへのアクセス権がありません。" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。" @@ -12255,10 +12168,9 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12286,13 +12198,18 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12312,8 +12229,8 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12336,24 +12253,24 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12375,16 +12292,16 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12430,7 +12347,7 @@ msgstr "何も選択されていません。" #: include/triggers.inc.php:91 #, c-format msgid "No trigger with trigger ID \"%1$s\"." -msgstr "" +msgstr "トリガーID\"%1$s\"のトリガーが存在しません。" #: chart4.php:42 msgid "No triggers defined." @@ -12440,7 +12357,7 @@ msgstr "トリガーが設定されていません。" msgid "No value" msgstr "値なし" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "論理値ではないフラグは廃止予定です。" @@ -12510,15 +12427,15 @@ msgstr "すべての結果が表示されるわけではありません。 よ msgid "Not all templates are linked to \"%1$s\"." msgstr "すべてのテンプレートは\"%1$s\"にリンクされていません。" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "\"guest\"ユーザーは言語を設定できません。" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "ゲストユーザーはパスワードを設定できません。" -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "\"guest\"ユーザーはテーマを設定できません。" @@ -12526,7 +12443,7 @@ msgstr "\"guest\"ユーザーはテーマを設定できません。" #: include/classes/api/clients/CLocalApiClient.php:192 #: include/classes/api/clients/CLocalApiClient.php:218 msgid "Not authorized." -msgstr "" +msgstr "許可されていません。" #: app/views/monitoring.widget.hostavail.view.php:34 #: app/views/monitoring.widget.hostavail.view.php:62 @@ -12597,7 +12514,7 @@ msgstr "使用可能なDSパスの数、<url> - VMwareサービスURL、<uuid> - #: include/classes/items/CHelpItems.php:89 #: include/classes/items/CHelpItems.php:451 msgid "Number of currently open file descriptors. Returns integer" -msgstr "" +msgstr "現在開いているファイルディスクリプタの数。整数値を返す" #: include/classes/items/CHelpItems.php:1209 msgid "Number of enabled items on the host." @@ -12852,15 +12769,16 @@ msgstr "OFF" msgid "Ok" msgstr "正常" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "古いイベントタグ名" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "古いイベントタグの値" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "古いタグ名" @@ -12882,10 +12800,6 @@ msgstr "一度だけ" msgid "One" msgstr "1つ" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "ホストグループが設定されていないオブジェクトが残っています" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "一度限り" @@ -12895,10 +12809,6 @@ msgstr "一度限り" msgid "One-time downtime" msgstr "一時的なダウンタイム" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "特権管理者のみがホストグループを作成できます。" - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Zabbixエージェント、SNMPv1、SNMPv2、SNMPv3がユニークかどうかだけチェックします。" @@ -12946,10 +12856,6 @@ msgstr "子サービスのないサービスのみ" msgid "Only services without problem tags" msgstr "障害タグのないサービスのみ" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "特権管理者のみが相関関係を作成できます。" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "特権管理者のみがダッシュボードのオーナーを設定できます。" @@ -12958,10 +12864,6 @@ msgstr "特権管理者のみがダッシュボードのオーナーを設定で msgid "Only super admins can set report owner." msgstr "特権管理者のみがレポートのオーナーを設定できます。" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "特権管理者のみが相関関係を更新できます。" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "有効なホストとアイテムのトリガーのみカウント" @@ -13010,7 +12912,7 @@ msgstr "操作対象のテンプレートがありません。" msgid "Operational data" msgstr "運用データ" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13019,33 +12921,33 @@ msgstr "運用データ" msgid "Operations" msgstr "実行内容" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "オペレータ" @@ -13454,16 +13356,16 @@ msgstr "ページャー" msgid "Parameter" msgstr "パラメータ" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "パラメータ\"%1$s\"は廃止予定です。" @@ -13513,7 +13415,7 @@ msgstr "親Webシナリオ" #: include/classes/api/services/CService.php:1304 #, c-format msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"." -msgstr "" +msgstr "サービス\"%1$s\"と\"%2$s\"の親子関係が衝突しています。" #: app/views/popup.httpstep.php:58 #: include/views/configuration.host.discovery.edit.php:86 @@ -13600,7 +13502,7 @@ msgstr "ウィジェットの貼り付け" msgid "Paste without external links" msgstr "リンクなしで貼り付け" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "パターン" @@ -13646,7 +13548,7 @@ msgstr "DNSクエリの実行。要求した情報のタイプの文字列を返 #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13779,7 +13681,7 @@ msgstr "ホストインベントリフィールドの自動設定" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14099,7 +14001,7 @@ msgstr "プロキシ" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14107,7 +14009,7 @@ msgstr "プロキシ" msgid "Proxy" msgstr "プロキシ" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "プロキシ\"%1$s\"はすでに存在しています。" @@ -14117,12 +14019,12 @@ msgstr "プロキシ\"%1$s\"はすでに存在しています。" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "ホスト\"%2$s\"のプロキシ\"%1$s\"は存在しません。" -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "プロキシ\"%1$s\"はアクション\"%2$s\"で使用されています。" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "プロキシ\"%1$s\"はディスカバリルール\"%2$s\"に利用されています。" @@ -14396,7 +14298,7 @@ msgstr "Regular" msgid "Regular expression" msgstr "正規表現" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "正規表現\"%1$s\"はすでに存在しています。" @@ -14655,7 +14557,7 @@ msgid "Replace dependencies" msgstr "依存関係を置換" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "指定文字列" @@ -14852,7 +14754,7 @@ msgstr "レスポンスタイプ: 文字列" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "結果" @@ -15093,7 +14995,7 @@ msgstr "SMTPサーバーポート番号" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15388,7 +15290,7 @@ msgstr "範囲" msgid "Script" msgstr "スクリプト" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "スクリプト\"%1$s\"はすでに存在します。" @@ -15501,7 +15403,7 @@ msgid "Security name" msgstr "セキュリティ名" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15715,11 +15617,11 @@ msgstr "サービスの復旧" msgid "Service start time must be less than end time." msgstr "サービス開始時刻は終了時刻よりも前でなければなりません。" -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "サービスのタグ名" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "サービスのタグの値" @@ -15731,7 +15633,7 @@ msgstr "サービス時間" msgid "Service times" msgstr "サービスタイム" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "サービスのタイプ" @@ -15744,7 +15646,7 @@ msgstr "サービスの更新" msgid "Service updated" msgstr "サービスを更新しました" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15756,7 +15658,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15774,9 +15676,9 @@ msgstr "サービスを更新しました" msgid "Session initialization error." msgstr "セッション初期化エラー。" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "セッションが切断されました。再度ログインしてください。" @@ -15838,7 +15740,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16683,10 +16585,10 @@ msgstr "テーブル\"%1$s\"にフィールド名\"%2$s\"が存在しません #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "タグ" @@ -16823,7 +16725,7 @@ msgstr "テンプレート" msgid "Template \"%1$s\" already exists." msgstr "テンプレート\"%1$s\"はすでに存在します。" -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -16907,7 +16809,7 @@ msgstr "同じ表示名\"%1$s\"を持つテンプレートがすでに存在し #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17202,7 +17104,7 @@ msgstr "終了" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17605,7 +17507,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17669,9 +17571,9 @@ msgstr "2つのマップ要素を選択する必要があります" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17681,7 +17583,7 @@ msgstr "2つのマップ要素を選択する必要があります" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17733,7 +17635,7 @@ msgstr "データ型" msgid "Types" msgstr "タイプ" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "ユーザーの役割\"%1$s\"にはUI要素\"%2$s\"は使用できません。" @@ -17804,8 +17706,8 @@ msgstr "マップ\"%1$s\"のURLには\"name\"と\"url\"の両方のフィール msgid "URLs" msgstr "URL" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "UUIDv4で指定してください" @@ -17915,21 +17817,23 @@ msgstr "単位" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "不明" @@ -17947,7 +17851,7 @@ msgid "Unknown error" msgstr "不明なエラー" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "不明なアイテム。選択したホストにそのようなアイテムは存在しません" @@ -18085,7 +17989,7 @@ msgstr "Up" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18219,37 +18123,37 @@ msgstr "アクションで使用" msgid "User" msgstr "ユーザー" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "ユーザー\"%1$s\"にユーザーグループを設定してください。" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "ユーザー\"%1$s\"はダッシュボード\"%2$s\"の所有者です。" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "ユーザー\"%1$s\"はマップ\"%2$s\"の所有者です。" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "ユーザー\"%1$s\"はレポート\"%2$s\"の所有者です。" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "ユーザー\"%1$s\"はレポート\"%2$s\"の受信者です。" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "ユーザー\"%1$s\"は\"%2$s\"アクション内で使用されています。" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "ユーザー\"%1$s\"は代わりにレポート\"%2$s\"を作成したユーザーです。" @@ -18271,13 +18175,13 @@ msgstr "ユーザーを追加しました" msgid "User agent string" msgstr "ユーザーエージェント文字列" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "ユーザーは無効のグループやGUIアクセスが無効のグループに自分自身を追加できません。" #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "ユーザーは自分の役割を変更できません。" @@ -18300,27 +18204,27 @@ msgstr[0] "ユーザーを削除しました" msgid "User group" msgstr "ユーザーグループ" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "ユーザーグループ\"%1$s\"はすでに存在します。" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "ユーザーグループ\"%1$s\"はレポート\"%2$s\"の受信者です。" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "ユーザーグループ\"%1$s\"は\"%2$s\"アクション内で使用されています。" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "ユーザーグループ\"%1$s\"はデータベース停止メッセージの設定に利用されています。" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "ユーザーグループ\"%1$s\"はスクリプト\"%2$s\"に利用されています。" @@ -18352,9 +18256,9 @@ msgstr[0] "ユーザーグループを更新しました" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "ID \"%1$s\"のユーザーグループは使用できません。" @@ -18369,7 +18273,7 @@ msgstr "ID \"%1$s\"のユーザーグループは使用できません。" msgid "User groups" msgstr "ユーザーグループ" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "自身のユーザーアカウントは削除できません。" @@ -18404,7 +18308,7 @@ msgstr "ユーザープロファイル" msgid "User role" msgstr "ユーザーの役割" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "ユーザーの役割\"%1$s\"は既に存在します。" @@ -18422,7 +18326,7 @@ msgstr[0] "ユーザーの役割を削除しました" msgid "User role updated" msgstr "ユーザーの役割を更新しました" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "ID\"%1$s\"のユーザーの役割は存在しません。" @@ -18471,12 +18375,12 @@ msgstr "ユーザーを更新しました" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "ID \"%1$s\"のユーザーは使用できません。" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "\"%1$s\"というユーザー名のユーザーはすでに存在します。" @@ -18787,14 +18691,14 @@ msgstr "バリデーション" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -18906,11 +18810,12 @@ msgstr "英語でWindowsパフォーマンスカウンターの値。数値、 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "任意のパフォーマンスカウンター値。リクエストに応じて、整数値、浮動小数点値、文字列値、テキスト値を返す。" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "新しいイベントタグの値" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "古いイベントタグの値" @@ -19445,7 +19350,7 @@ msgstr "毎年" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19502,7 +19407,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "アクションのグローバルスクリプト\"%1$s\"のターゲットが指定されていません。" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19635,28 +19539,28 @@ msgstr "[日の値が正しくありません: \"%1$s\"]" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "[月の値が正しくありません: \"%1$s\"]" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "DNS名を指定してください" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "論理値で指定してください" #: include/classes/validators/CNewValidator.php:300 msgid "a boolean value is expected" -msgstr "" +msgstr "論理値で指定してください" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "文字列で指定してください" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "日付はYYYY-MM-DDフォーマットで指定してください。" @@ -19665,37 +19569,37 @@ msgid "a digit" msgstr "数字" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "浮動小数点の値で指定してください" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "16進数のカラーコード(6桁)で指定してください" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "LLDマクロを指定してください" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "数値の小数の桁が多すぎます" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "数字で指定してください" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "数字が大きすぎます" @@ -19716,7 +19620,7 @@ msgstr "相対的な時間で指定してください" msgid "a special character" msgstr "特殊記号" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "文字列か数字か空文字列で指定してください" @@ -19724,19 +19628,19 @@ msgstr "文字列か数字か空文字列で指定してください" msgid "a time is expected" msgstr "時間で指定してください" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "期間を指定してください" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19786,7 +19690,7 @@ msgstr "すべて" msgid "all media" msgstr "すべてのメディア" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "IPアドレスを指定してください" @@ -19808,23 +19712,23 @@ msgstr "IPアドレスを指定してください" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "配列で指定してください" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "配列か文字列で指定してください" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "配列かオブジェクトで指定してください" @@ -19834,7 +19738,7 @@ msgid "an empty string is expected" msgstr "空の文字列で指定してください" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "16進文字列で指定してください" @@ -19842,11 +19746,15 @@ msgstr "16進文字列で指定してください" msgid "an explicit time is expected" msgstr "具体的な時間を指定してください" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "整数で指定してください" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "符号なし整数で指定してください" @@ -20007,13 +19915,7 @@ msgstr "変更できません" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20044,13 +19946,13 @@ msgstr "変更できません" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20068,14 +19970,14 @@ msgstr "変更できません" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20148,7 +20050,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "含む" @@ -20239,7 +20142,7 @@ msgstr "降順" msgid "description" msgstr "説明" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "ディレクトリを指定してください" @@ -20261,13 +20164,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "ホスト\"%2$s\"上のディスカバリルール\"%1$s\"は監視されていません" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "含まない" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "等しくない" @@ -20293,7 +20196,8 @@ msgid "e() - Returns Euler's number" 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/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20330,9 +20234,9 @@ msgstr "条件式が指定されていません" msgid "failed to parse JSON" msgstr "JSONの解析に失敗しました" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" -msgstr "" +msgstr "ファイル形式はサポートされていません" #: app/controllers/CControllerPopupTriggerExpr.php:579 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)" @@ -20421,10 +20325,10 @@ msgstr "アイコン" msgid "image" msgstr "イメージ" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" -msgstr "" +msgstr "画像サイズは%1$s以下にしてください" #: include/actions.inc.php:28 msgid "in" @@ -20466,15 +20370,19 @@ msgstr "要素の数が正しくありません" msgid "incorrect expression starting from \"%1$s\"" msgstr "\"%1$s\"から始まる条件式が正しくありません" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "間違った書式が\"%1$s\"付近に見つかりました" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "関数\"%1$s\"の使い方が正しくありません" @@ -20502,7 +20410,7 @@ msgstr "Prometheusパターンが正しくありません" msgid "invalid address range \"%1$s\"" msgstr "アドレスの範囲 \"%1$s\"が正しくありません" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "UTF-8のバイトシーケンスが正しくありません" @@ -20531,27 +20439,27 @@ msgstr "関数\"%1$s\"内の4番目のパラメーターが正しくありませ msgid "invalid history storage period" msgstr "ヒストリの保存期間が正しくありません" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "ホストグループ名が正しくありません" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "ホスト名が正しくありません" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "関数\"%1$s\"内のパラメーターの数が正しくありません" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "範囲の条件式が正しくありません" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "正規表現が正しくありません" @@ -20579,7 +20487,7 @@ msgstr "以上" msgid "is less than or equals" msgstr "以下" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "{}で括られていないか不正な値です" @@ -20729,7 +20637,7 @@ msgstr "一致する" msgid "max" msgstr "最大" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "最大期間がデフォルトのフィルタ期間よりも小さいです" @@ -20769,7 +20677,7 @@ msgid "min() - Minimum value for period T" msgstr "min() - 期間Tでの最小値" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "%1$s文字以上で指定してください" @@ -20785,19 +20693,19 @@ msgstr "mod() - 割り算の余り" #: app/controllers/CControllerPopupTriggerExpr.php:783 msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)" -msgstr "" +msgstr "monodec() - アイテムの値が減少し続けているかチェック (1 - 単調、0 - その他)、モード (strict - 厳密な単調性)" #: app/controllers/CControllerPopupTriggerExpr.php:790 msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)" -msgstr "" +msgstr "monoinc() - アイテムの値が増加し続けているかチェック (1 - 単調、0 - その他)、モード (strict - 厳密な単調性)" #: include/func.inc.php:583 msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "%1$s文字の長さにしてください" @@ -20818,8 +20726,8 @@ msgstr "少なくとも%1$d文字以上にしてください" msgid "must contain at least one digit" msgstr "少なくとも数字を1文字含めるようにしてください" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "少なくとも1つのLLDマクロを含めることが必要です" @@ -21035,6 +20943,10 @@ msgstr "radians() - 値を角度からラジアンに変換" msgid "rand() - A random integer value" msgstr "rand() - ランダムな整数値" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21080,11 +20992,11 @@ msgstr "正規表現" msgid "regular expression" msgstr "正規表現" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "replace() - パターンを検索して指定文字列に置き換える" @@ -21096,15 +21008,15 @@ msgstr "置換文字列" msgid "right" msgstr "右" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "round() - 小数点以下桁数で四捨五入" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21152,7 +21064,7 @@ msgstr "サービス" msgid "short description" msgstr "説明" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21171,15 +21083,15 @@ msgstr "説明" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "空にしてください" @@ -21195,31 +21107,31 @@ msgstr "アイコンのマッピングを表示" msgid "sign in as guest" msgstr "ゲストとしてサインイン" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "sin() - 値のサイン、ラジアンで示された角度の値" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "sinh() - 値のハイパボリックサイン" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "skewness() - 確率分布の非対称性を測定" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "sqrt() - 値の平方根" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "stddevpop() - 母標準偏差" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "stddevsamp() - サンプル標準偏差" @@ -21227,15 +21139,15 @@ msgstr "stddevsamp() - サンプル標準偏差" msgid "sum" msgstr "合計" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "sum() - 期間Tでの合計値" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "sumofsquares() - 平方和" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "指定された資格情報はユニークではありません" @@ -21248,7 +21160,7 @@ msgstr "指定された資格情報はユニークではありません" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21259,7 +21171,7 @@ msgstr "指定された資格情報はユニークではありません" msgid "tag" msgstr "タグ" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "tan() - 値のタンジェント" @@ -21268,14 +21180,14 @@ msgstr "tan() - 値のタンジェント" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "テンプレートID\"%1$s\"が%2$s回使用されています" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" -msgstr "" +msgstr "最後の改行がありません" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21287,20 +21199,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "パラメータ \"%1$s\"が指定されていません" @@ -21332,7 +21244,7 @@ msgstr "第3" msgid "third parameter is expected" msgstr "3番目のパラメータを指定してください" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "デフォルトのフィルタ期間が最大期間を超えました" @@ -21340,31 +21252,31 @@ msgstr "デフォルトのフィルタ期間が最大期間を超えました" msgid "time shift" msgstr "タイムシフト" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "time() - 現在時刻" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft() - 期間Tに基づく閾値に達するまでの時間" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "trendavg() - 期間のシフトを含む期間Tでの平均値" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "trendcount() - 期間Tで正常に取得した値の数" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "trendmax() - 期間のシフトを含む期間Tでの最大値" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "trendmin() - 期間のシフトを含む期間Tでの最小値" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "trendsum() - 期間のシフトを含む期間Tでの合計値" @@ -21378,7 +21290,7 @@ msgstr "トリガー" msgid "trigger does not allow manual closing" msgstr "トリガーは手動クローズを許可されていません" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "トリガー条件式には少なくとも1つの /host/key の参照が必要です" @@ -21390,11 +21302,11 @@ msgstr "トリガーのプロトタイプは他のテンプレートやホスト msgid "trigger with linkages cannot be moved to another template or host" msgstr "リンクのあるトリガーは他のテンプレートやホストに移動できません" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "trim() - 文字列の先頭から最後までより指定した文字列を削除" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "truncate() - 小数点以下桁数で切り捨て" @@ -21403,7 +21315,7 @@ msgstr "truncate() - 小数点以下桁数で切り捨て" msgid "type here to search" msgstr "検索文字列を入力" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "アクセスできないURLです" @@ -21451,11 +21363,12 @@ msgstr "マクロの末尾が間違っています" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "パラメータ \"%1$s\"が間違っています" @@ -21481,8 +21394,8 @@ msgstr "テキスト\"%1$s\"が間違っています" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21507,6 +21420,10 @@ msgstr "サポートされていない時間の単位です" msgid "unsupported version number" msgstr "サポートされていないバージョン番号です" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21564,61 +21481,67 @@ msgstr "値\"%1$s\"が存在しません" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "値%1$sはすでにあります" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "値が長すぎます" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 -#, c-format +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 +#, fuzzy, c-format msgid "value must be %1$s" -msgstr "値は%1$sにしてください" +msgid_plural "value must be one of %1$s" +msgstr[0] "値は%1$sにしてください" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "値は\"%1$s\"から\"%2$s\"までにしてください" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "値は空にしてください" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "値は空にするか%1$sのうち1つを設定してください" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21649,15 +21572,13 @@ msgstr "値は\"%1$s\"以上にしてください" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "値は%1$sから指定してください" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "値は%1$sの範囲内にしてください" @@ -21666,7 +21587,7 @@ msgstr "値は%1$sの範囲内にしてください" msgid "value of first parameter is too long" msgstr "最初のパラメータの値が長すぎます" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "新しいイベントタグの値" @@ -21679,11 +21600,11 @@ msgstr "2つめのパラメータの値が長すぎます" msgid "value of third parameter must be one of %1$s" msgstr "3つめのパラメータの値は%1$sから選んでください" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "varpop() - 母分散" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "varsamp() - サンプル分散" diff --git a/ui/locale/ka/LC_MESSAGES/frontend.po b/ui/locale/ka/LC_MESSAGES/frontend.po index 03dbaaf6291..f0bba2d538d 100644 --- a/ui/locale/ka/LC_MESSAGES/frontend.po +++ b/ui/locale/ka/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2021-03-19 18:13+0300\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: none\n" @@ -481,7 +481,7 @@ msgstr "დადასტურება" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "დადასტურებულია" @@ -580,7 +580,7 @@ msgstr "მოქმედება \"%1$s\" უკვე არსებობ msgid "Action \"%1$s\" no operations defined." msgstr "" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -705,7 +705,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -716,7 +716,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -972,7 +972,7 @@ msgstr "ასაკი ნაკლებია ვიდრე" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1294,7 +1294,7 @@ msgstr "" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1303,8 +1303,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1315,6 +1315,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1326,7 +1331,7 @@ msgstr "" msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1412,7 +1417,7 @@ msgstr "ავთენტიფიკაცია" msgid "Authentication algorithm" msgstr "ავთენტიფიკაციის ალგორითმი" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1461,7 +1466,7 @@ msgstr "" msgid "Auto-login" msgstr "ავტო-შესვლა" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1472,7 +1477,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1735,7 +1740,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1770,7 +1775,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1975,7 +1980,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2093,7 +2098,7 @@ msgid "Cannot delete API token" msgid_plural "Cannot delete API tokens" msgstr[0] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Zabbix-ის შიდა მომხმარებლის \"%1$s\" წაშლა ვერ მოხერხდა, სცადეთ ამ მომხმარებლის გათიშვა." @@ -2102,7 +2107,7 @@ msgstr "Zabbix-ის შიდა მომხმარებლის \"%1$s\" msgid "Cannot delete action" msgstr "მოქმედების წაშლა ვერ მოხერხდა" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2163,7 +2168,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group." msgstr[0] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2230,7 +2235,7 @@ msgid "Cannot delete proxy" msgid_plural "Cannot delete proxies" msgstr[0] "" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2250,7 +2255,7 @@ msgid "Cannot delete script" msgid_plural "Cannot delete scripts" msgstr[0] "" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "სცენარების წაშლა ვერ მოხერხდა. სცენარი \"%1$s\" გამოიყენება მოქმედების ოპერაციაში \"%2$s\"." @@ -2618,16 +2623,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2639,7 +2644,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist. msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist." msgstr[0] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "" @@ -2659,7 +2664,7 @@ msgid "Cannot load module at: %1$s." msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2721,7 +2726,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "" @@ -2803,7 +2808,7 @@ msgid "Cannot unblock user" msgid_plural "Cannot unblock users" msgstr[0] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "" @@ -2816,7 +2821,7 @@ msgstr "" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2878,8 +2883,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -2938,9 +2944,7 @@ msgstr "" msgid "Cannot update group" msgstr "" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -3021,12 +3025,12 @@ msgstr "" msgid "Cannot update proxy" msgstr "" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3046,9 +3050,9 @@ msgstr "" msgid "Cannot update script" msgstr "" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3229,8 +3233,8 @@ msgid "Character string not included" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3406,7 +3410,7 @@ msgstr "" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3444,13 +3448,13 @@ msgstr "" msgid "Close expression constructor" msgstr "" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3547,7 +3551,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3558,11 +3562,6 @@ msgstr "" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3578,11 +3577,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3774,7 +3768,7 @@ msgstr "" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -3976,12 +3970,11 @@ msgstr "" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4005,16 +3998,6 @@ msgid "Correlation enabled" msgid_plural "Correlations enabled" msgstr[0] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4025,8 +4008,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "" @@ -4398,7 +4381,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "" @@ -4672,8 +4655,8 @@ msgstr "" msgid "December" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4683,7 +4666,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4780,7 +4763,7 @@ msgstr "" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4830,7 +4813,7 @@ msgstr "" msgid "Delete current action?" msgstr "" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5128,7 +5111,7 @@ msgstr "" msgid "Dependencies" msgstr "" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "" @@ -5136,7 +5119,7 @@ msgstr "" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5345,10 +5328,10 @@ msgstr "" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5431,7 +5414,7 @@ msgid "Discovery by proxy" msgstr "" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "" @@ -5443,7 +5426,7 @@ msgstr "" msgid "Discovery list" msgstr "" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "" @@ -5539,7 +5522,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5550,7 +5533,7 @@ msgstr "" msgid "Discovery rules deleted" msgstr "" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "" @@ -5706,18 +5689,6 @@ msgstr "" msgid "Draw style" msgstr "" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5730,11 +5701,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5894,10 +5860,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -5924,11 +5886,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6113,7 +6073,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6124,7 +6084,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6167,7 +6127,7 @@ msgid "English (en_US)" msgstr "" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6242,7 +6202,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6277,11 +6237,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6616,7 +6576,6 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -6984,7 +6943,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7228,12 +7187,12 @@ msgstr "" msgid "Group" msgstr "" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7563,7 +7522,7 @@ msgstr[0] "" msgid "Host \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7571,7 +7530,7 @@ msgstr "" msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7640,17 +7599,17 @@ msgstr[0] "" msgid "Host group" msgstr "" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7664,9 +7623,9 @@ msgid "Host group label type" msgstr "" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7682,8 +7641,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7869,7 +7828,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -7957,7 +7916,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "" @@ -7982,7 +7941,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8039,12 +7998,12 @@ msgstr "" msgid "Icon map" msgstr "" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "" @@ -8068,7 +8027,7 @@ msgstr "" msgid "Icon mapping" msgstr "" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8297,7 +8256,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8310,11 +8269,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8526,24 +8485,6 @@ msgstr "" msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "" -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8628,20 +8569,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8706,11 +8638,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8818,7 +8745,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -8932,11 +8859,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -8958,10 +8880,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9023,18 +8945,6 @@ msgstr "" msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9096,12 +9006,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9213,7 +9117,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9224,9 +9128,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9377,7 +9281,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "" @@ -9505,7 +9409,7 @@ msgstr "" msgid "Interval" msgstr "" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9528,7 +9432,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9542,7 +9446,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9589,9 +9493,11 @@ msgstr "" #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9631,17 +9537,17 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9649,14 +9555,14 @@ msgstr "" #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9664,111 +9570,116 @@ msgstr "" #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -9976,7 +9887,7 @@ msgstr[0] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10154,7 +10065,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10347,7 +10258,7 @@ msgstr "" msgid "Language" msgstr "" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -10942,7 +10853,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11183,7 +11094,7 @@ msgid "Maximum time period to display is %1$s day." msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11208,7 +11119,7 @@ msgstr "" msgid "Media type" msgstr "" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11249,7 +11160,7 @@ msgstr "" msgid "Media type updated" msgstr "" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11261,7 +11172,7 @@ msgstr "" msgid "Media types" msgstr "" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11503,7 +11414,7 @@ msgstr[0] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -11905,15 +11816,17 @@ msgstr "" msgid "New element" msgstr "" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -11933,7 +11846,7 @@ msgstr "" msgid "New service time" msgstr "" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -11960,7 +11873,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -11989,30 +11902,6 @@ msgstr "" msgid "No" msgstr "" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12062,11 +11951,6 @@ msgstr "" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12205,17 +12089,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12251,10 +12164,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12282,13 +12194,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12308,8 +12225,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12332,24 +12249,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12371,16 +12288,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12436,7 +12353,7 @@ msgstr "" msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12506,15 +12423,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12848,15 +12765,16 @@ msgstr "" msgid "Ok" msgstr "" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12878,10 +12796,6 @@ msgstr "" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "" @@ -12891,10 +12805,6 @@ msgstr "" msgid "One-time downtime" msgstr "" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "" - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -12942,10 +12852,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -12954,10 +12860,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "" @@ -13006,7 +12908,7 @@ msgstr "" msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13015,33 +12917,33 @@ msgstr "" msgid "Operations" msgstr "" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "" @@ -13450,16 +13352,16 @@ msgstr "" msgid "Parameter" msgstr "" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13596,7 +13498,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13642,7 +13544,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13775,7 +13677,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14095,7 +13997,7 @@ msgstr "" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14103,7 +14005,7 @@ msgstr "" msgid "Proxy" msgstr "" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14113,12 +14015,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "" -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "" @@ -14392,7 +14294,7 @@ msgstr "" msgid "Regular expression" msgstr "" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14651,7 +14553,7 @@ msgid "Replace dependencies" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14848,7 +14750,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "" @@ -15089,7 +14991,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15384,7 +15286,7 @@ msgstr "" msgid "Script" msgstr "" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15497,7 +15399,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15710,11 +15612,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "" -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15726,7 +15628,7 @@ msgstr "" msgid "Service times" msgstr "" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "" @@ -15739,7 +15641,7 @@ msgstr "" msgid "Service updated" msgstr "" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15751,7 +15653,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15769,9 +15671,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "" @@ -15833,7 +15735,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16678,10 +16580,10 @@ msgstr "" #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "" @@ -16818,7 +16720,7 @@ msgstr "" msgid "Template \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -16902,7 +16804,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17197,7 +17099,7 @@ msgstr "" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17600,7 +17502,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17664,9 +17566,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17676,7 +17578,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17728,7 +17630,7 @@ msgstr "" msgid "Types" msgstr "" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17799,8 +17701,8 @@ msgstr "" msgid "URLs" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -17910,21 +17812,23 @@ msgstr "" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "" @@ -17942,7 +17846,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "" @@ -18080,7 +17984,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18214,37 +18118,37 @@ msgstr "" msgid "User" msgstr "" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18266,13 +18170,13 @@ msgstr "" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "" #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18295,27 +18199,27 @@ msgstr[0] "" msgid "User group" msgstr "" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "" @@ -18347,9 +18251,9 @@ msgstr[0] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18364,7 +18268,7 @@ msgstr "" msgid "User groups" msgstr "" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "" @@ -18399,7 +18303,7 @@ msgstr "" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18417,7 +18321,7 @@ msgstr[0] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18466,12 +18370,12 @@ msgstr "" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18782,14 +18686,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -18901,11 +18805,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19440,7 +19345,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19497,7 +19402,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19630,11 +19534,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19642,16 +19546,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19660,37 +19564,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19711,7 +19615,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19719,19 +19623,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19781,7 +19685,7 @@ msgstr "" msgid "all media" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19803,23 +19707,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19829,7 +19733,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19837,11 +19741,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20002,13 +19910,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20039,13 +19941,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20063,14 +19965,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20143,7 +20045,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20234,7 +20137,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20256,13 +20159,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20288,7 +20191,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20325,7 +20229,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20416,7 +20320,7 @@ msgstr "" msgid "image" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20461,15 +20365,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20497,7 +20405,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20526,27 +20434,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20574,7 +20482,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20724,7 +20632,7 @@ msgstr "" msgid "max" msgstr "" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20764,7 +20672,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20791,8 +20699,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20813,8 +20721,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21030,6 +20938,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21075,11 +20987,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21091,15 +21003,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21147,7 +21059,7 @@ msgstr "" msgid "short description" msgstr "" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21166,15 +21078,15 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21190,31 +21102,31 @@ msgstr "" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21222,15 +21134,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21243,7 +21155,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21254,7 +21166,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21263,14 +21175,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21282,20 +21194,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21327,7 +21239,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21335,31 +21247,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21373,7 +21285,7 @@ msgstr "" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21385,11 +21297,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21398,7 +21310,7 @@ msgstr "" msgid "type here to search" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21446,11 +21358,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21476,8 +21389,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21502,6 +21415,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21559,61 +21476,67 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21644,15 +21567,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21661,7 +21582,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21674,11 +21595,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/ko/LC_MESSAGES/frontend.po b/ui/locale/ko/LC_MESSAGES/frontend.po index 6adb72544dc..885e09e5319 100644 --- a/ui/locale/ko/LC_MESSAGES/frontend.po +++ b/ui/locale/ko/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2016-01-22 16:15+0300\n" "Last-Translator: JONGKWON <jkkim.photo@gmail.com>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -480,7 +480,7 @@ msgstr "인지" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "장애대응 완료" @@ -579,7 +579,7 @@ msgstr "액션 \"%1$s\"는 이미 존재합니다." msgid "Action \"%1$s\" no operations defined." msgstr "액션 \"%1$s\"에 실행내용이 설정되어 있지 않습니다." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -703,7 +703,7 @@ msgstr "종료시간" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -714,7 +714,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -970,7 +970,7 @@ msgstr "표시시간" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1292,7 +1292,7 @@ msgstr "시작시간 (시:분)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1301,8 +1301,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1313,6 +1313,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "적어도 1개의 호스트 그룹 혹은 호스트가 선택되어 있을 필요가 있습니다." +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1324,7 +1329,7 @@ msgstr "최소 하나 이상의 메인터넌스 기간을 작성할 필요가 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1410,7 +1415,7 @@ msgstr "인증" msgid "Authentication algorithm" msgstr "인증 알고리즘" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "인증에 실패하였습니다 : %1$s" @@ -1459,7 +1464,7 @@ msgstr "자동" msgid "Auto-login" msgstr "자동 로그인 (1개월)" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "자동 로그인과 자동 로그아웃을 동시에 활성화 할 수는 없습니다." @@ -1470,7 +1475,7 @@ msgstr "자동 로그아웃" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1729,7 +1734,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1764,7 +1769,7 @@ msgstr "콜백" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1969,7 +1974,7 @@ msgstr "LDAP서버에 바인드 할 수 없습니다." msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2087,7 +2092,7 @@ msgid "Cannot delete API token" msgid_plural "Cannot delete API tokens" msgstr[0] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Zabbix 유저 \"%1$s\"를 삭제할 수 없습니다. 유저를 비활성으로 설정해 주십시오." @@ -2096,7 +2101,7 @@ msgstr "Zabbix 유저 \"%1$s\"를 삭제할 수 없습니다. 유저를 비활 msgid "Cannot delete action" msgstr "액션을 삭제할 수 없습니다" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2159,7 +2164,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group." msgstr[0] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2226,7 +2231,7 @@ msgid "Cannot delete proxy" msgid_plural "Cannot delete proxies" msgstr[0] "프록시를 삭제할 수 없습니다" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2246,7 +2251,7 @@ msgid "Cannot delete script" msgid_plural "Cannot delete scripts" msgstr[0] "스크립트를 삭제할 수 없습니다" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "스크립트를 삭제할 수 없습니다. 스크립트 \"%1$s\"는 실행하는 액션 \"%2$s\"에서 이용되고 있습니다." @@ -2614,16 +2619,16 @@ msgstr "\"%4$s\"상의 디스커버리 규칙 \"%3$s\"의 아이템 프로토타 msgid "Cannot have empty visible template name." msgstr "템플릿 표시명에 공백은 설정할 수 없습니다." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2635,7 +2640,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist. msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist." msgstr[0] "템플릿 \"%1$s\"를 가져올 수 없습니다. 링크되어 있는 템플릿 \"%2$s\"가 존재하지 않습니다." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "트리거 조건식을 추가할 수 없습니다" @@ -2655,7 +2660,7 @@ msgid "Cannot load module at: %1$s." msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2717,7 +2722,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "응답을 받을 수 없습니다. Zabbix서버 \"%1$s\"의 접속을 확인해 주십시오." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "게스트 사용자의 이름을 변경할 수 없습니다" @@ -2799,7 +2804,7 @@ msgid "Cannot unblock user" msgid_plural "Cannot unblock users" msgstr[0] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Web시나리오의 링크삭제와 삭제를 할 수 없습니다." @@ -2812,7 +2817,7 @@ msgstr "템플릿의 링크를 삭제할 수 없습니다" msgid "Cannot unlink template." msgstr "템플릿의 링크를 삭제할 수 없습니다." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2874,9 +2879,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "발견된 그래프를 갱신할 수 없습니다" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "발견된 호스트 그룹을 갱신할 수 없습니다" +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -2934,9 +2940,7 @@ msgstr "그래프 프로토타입을 갱신할 수 없습니다" msgid "Cannot update group" msgstr "그룹을 갱신할 수 없습니다" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "발견된 호스트 \"%1$s\"의 그룹을 갱신할 수 없습니다" @@ -3017,12 +3021,12 @@ msgstr "네트워크 맵을 갱신할 수 없습니다" msgid "Cannot update proxy" msgstr "프록시를 갱신할 수 없습니다" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "발견된 호스트 \"%1$s\"의 프록시를 갱신할 수 없습니다" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3042,9 +3046,9 @@ msgstr "" msgid "Cannot update script" msgstr "스크립트를 갱신할 수 없습니다" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3225,8 +3229,8 @@ msgid "Character string not included" msgstr "문자열이 포함되지 않음" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3402,7 +3406,7 @@ msgstr "시각" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3440,13 +3444,13 @@ msgstr "닫기" msgid "Close expression constructor" msgstr "조건식 빌더를 닫는다" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "새 이벤트를 닫기" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "오래된 이벤트를 닫기" @@ -3543,7 +3547,7 @@ msgstr "압축" msgid "Concurrent sessions" msgstr "동시 세션의 숫자" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3554,11 +3558,6 @@ msgstr "조건" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "액션\"%1$s\"의 조건 \"%2$s\"는 식 \"%3$s\"에서 이용되지 않습니다." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "상관관계 \"%1$s\"의 조건 \"%2$s\"는 조건식 \"%3$s\" 안에서 사용할 수 없습니다." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3574,11 +3573,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "액션\"%1$s\"의 식 \"%3$s\"내에서 이용되어 있는 조건 \"%2$s\"는 설정되어 있지 않습니다." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "상관관계 \"%1$s\"의 조건식 \"%3$s\"에서 사용되고 있는 조건 \"%2$s\"는 설정되어 있지 않습니다." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3770,7 +3764,7 @@ msgstr "확인 텍스트" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "축하합니다! Zabbix frontend 설치가 종료되었습니다." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -3972,12 +3966,11 @@ msgstr "복사" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "상관관계" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "상관관계 \"%1$s\"는 이미 존재합니다." @@ -4002,16 +3995,6 @@ msgid "Correlation enabled" msgid_plural "Correlations enabled" msgstr[0] "상관관계를 활성화하였습니다" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "상관관계가 파라미터에 설정되어있지 않습니다: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "상관관계의 이름은 필수입니다." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "상관관계 규칙" @@ -4022,8 +4005,8 @@ msgstr "상관관계를 갱신하였습니다" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "회" @@ -4395,7 +4378,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS 이름" @@ -4669,8 +4652,8 @@ msgstr "12월" msgid "December" msgstr "12월" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4680,7 +4663,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4777,7 +4760,7 @@ msgstr "연장 시간" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4827,7 +4810,7 @@ msgstr "템플릿과 데이터를 삭제하시겠습니까? (경고: 링크되 msgid "Delete current action?" msgstr "현재 액션을 삭제하시겠습니까?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "현재의 상관관계를 삭제하시겠습니다?" @@ -5125,7 +5108,7 @@ msgstr "" msgid "Dependencies" msgstr "의존관계" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "의존처" @@ -5133,7 +5116,7 @@ msgstr "의존처" msgid "Dependent item" msgstr "의존 아이템" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5342,10 +5325,10 @@ msgstr "선택한 Web시나리오를 비활성으로 하시겠습니까?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5428,7 +5411,7 @@ msgid "Discovery by proxy" msgstr "프록시에 의한 디스커버리" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "디스커버리 체크" @@ -5440,7 +5423,7 @@ msgstr "디스커버리 체크" msgid "Discovery list" msgstr "디스커버리 리스트" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "디스커버리 오브젝트" @@ -5538,7 +5521,7 @@ msgstr "디스커버리 규칙을 갱신하였습니다" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5549,7 +5532,7 @@ msgstr "디스커버리 규칙" msgid "Discovery rules deleted" msgstr "디스커버리 규칙을 삭제하였습니다" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "디스커버리 상태" @@ -5705,18 +5688,6 @@ msgstr "그래프 형식" msgid "Draw style" msgstr "종류" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "상관관계 \"%3$s\"의 \"%1$s\"의 값 \"%2$s\"가 중복됩니다." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "상관관계의 \"%1$s\"의 값 \"%2$s\"가 중복되었습니다." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5729,11 +5700,6 @@ msgstr "맵을 위한 \"name\"의 값 \"%1$s\"이 중복되었습니다." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5893,10 +5859,6 @@ msgstr "Web시나리오 \"%1$s\"를 위한 SSL비밀키 파일이 공백입니 msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "상관관계ID가 입력되지 않았습니다." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -5923,11 +5885,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6112,7 +6072,7 @@ msgstr "트래핑의 활성화" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6123,7 +6083,7 @@ msgstr "트래핑의 활성화" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6166,7 +6126,7 @@ msgid "English (en_US)" msgstr "영어 (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6241,7 +6201,7 @@ msgid "Event correlation" msgstr "이벤트 상관관계" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "이벤트 상관관계 규칙" @@ -6276,11 +6236,11 @@ msgstr "이벤트 로그의 감시. 로그 값을 리턴." msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "이벤트 태그의 짝" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "이벤트타입" @@ -6615,7 +6575,6 @@ msgstr "항목 \"%1$s\"는 NULL로 설정할 수 없습니다." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -6983,7 +6942,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "설정한 조건식은 매크로가 아닙니다" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "글로벌 정규표현 \"%1$s\" 는 존재하지 않습니다." @@ -7227,12 +7186,12 @@ msgstr "그리드" msgid "Group" msgstr "그룹" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "호스트 프로토타입에서 이용되고 있기 때문에 그룹\"%1$s\"은 삭제할 수 없습니다." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "상관관계의 조건에서 사용되고 있는 그룹 \"%1$s\"은 삭제할 수 없습니다." @@ -7562,7 +7521,7 @@ msgstr[0] "호스트" msgid "Host \"%1$s\" already exists." msgstr "호스트 \"%1$s\"는 이미 존재합니다." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7570,7 +7529,7 @@ msgstr "호스트 \"%1$s\"는 이미 존재합니다." msgid "Host \"%1$s\" cannot be without host group." msgstr "호스트\"%1$s\"에 호스트 그룹을 설정해 주세요." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7639,17 +7598,17 @@ msgstr[0] "호스트를 활성화 하였습니다" msgid "Host group" msgstr "호스트 그룹" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "호스트 그룹\"%1$s\"는 모두 존재합니다." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "글로벌 스크립트에 이용되고 있기 때문에 호스트그룹 \"%1$s\"를 삭제할 수 없습니다." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7663,9 +7622,9 @@ msgid "Host group label type" msgstr "호스트 그룹의 라벨타입" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "ID \"%1$s\"의 호스트그룹은 사용할 수 없습니다." @@ -7681,8 +7640,8 @@ msgstr "ID \"%1$s\"의 호스트그룹은 사용할 수 없습니다." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7868,7 +7827,7 @@ msgstr "같은 호스트의 표시 이름 \"%1$s\"를 지닌 호스트가 이미 #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -7956,7 +7915,7 @@ msgstr "IP 주소" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP 주소" @@ -7981,7 +7940,7 @@ msgstr "IP주소의 범위 \"%1$s\"가 주소제한 \"%2$s\"을 초과합니다. #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8038,12 +7997,12 @@ msgstr "아이콘의 하이라이트" msgid "Icon map" msgstr "아이콘 매핑" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "아이콘 매핑\"%1$s\"을 삭제할 수 없습니다. 맵\"%2$s\"에 이용되고 있습니다." @@ -8067,7 +8026,7 @@ msgstr "아이콘 매핑를 갱신하였습니다" msgid "Icon mapping" msgstr "아이콘 매핑" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "ID \"%1$s\"의 아이콘은 사용할 수 없습니다." @@ -8296,7 +8255,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8309,11 +8268,11 @@ msgstr "접근할 수 없는 맵" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "접근할 수 없는 템플릿" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "접속이 안되는 트리거" @@ -8525,24 +8484,6 @@ msgstr "실행하는 액션의 유저 그룹의 값이 올바르지 않습니다 msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "실행하는 액션의 유저 값이 올바르지 않습니다. 사용자가 존재하지 않거나 액세스 권한이 없습니다." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8627,20 +8568,11 @@ msgstr "액션 \"%1$s\"의 조건식이 올바르지 않습니다." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "디스커버리 규칙 \"%1$s\"의 조건식이 올바르지 않습니다." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "상관관계ID가 올바르지 않습니다." - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "액션 \"%1$s\"의 커스텀 조건식 \"%2$s\"이 올바르지 않습니다 ： %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "상관관계 \"%1$s\"의 커스텀 조건식 \"%2$s\"이 올바르지 않습니다: %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8705,11 +8637,6 @@ msgstr "액션 \"%1$s\"의 필터조건식ID가 올바르지 않습니다." msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "디스커버리 규칙 \"%1$s\"의 필터 조건식ID가 올바르지 않습니다." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "상관관계 \"%1$s\"의 필터 조건식ID가 올바르지 않습니다." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8817,7 +8744,7 @@ msgstr "맵ID가 올바르지 않습니다." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "메소트 \"%1$s.%2$s\"가 올바르지 않습니다." @@ -8931,11 +8858,6 @@ msgstr "트리거 프로토타입 조건식이 올바르지 않습니다. 트리 msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "액션\"%1$s\"의 계산 타입이 올바르지 않습니다." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "상관관계 \"%1$s의 계산타입이 올바르지 않습니다." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -8957,10 +8879,10 @@ msgstr "맵 \"%1$s\"의 지정된 유저ID가 올바르지 않습니다." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "맵 \"%1$s\"의 지정된 유저 그룹ID가 올바르지 않습니다." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9022,18 +8944,6 @@ msgstr "정수 항목\"%2$s\"의 값 \"%1$s\"가 올바르지 않습니다." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "부호없는 정수 항목\"%2$s\"의 값 \"%1$s\"가 올바르지 않습니다." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "상관관계 \"%3$s\"의 필드 \"%2$s\"의 값 \"%1$s\"이 올바르지 않습니다." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9095,12 +9005,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9212,7 +9116,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9223,9 +9127,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9376,7 +9280,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "삽입" @@ -9504,7 +9408,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "갱신 간격" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9527,7 +9431,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "액션의 실행조건이 올바르지 않습니다 : %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9541,7 +9445,7 @@ msgstr "날짜가 올바르지 않습니다." msgid "Invalid email address \"%1$s\"." msgstr "메일 주소 \"%1$s\"가 올바르지 않습니다." -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "ID \"%1$s\"의 미디어 타입의 메일 주소가 올바르지 않습니다." @@ -9588,9 +9492,11 @@ msgstr "메소드의 파라미터가 올바르지 않습니다." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9630,17 +9536,17 @@ msgstr "메소드의 파라미터가 올바르지 않습니다." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9648,14 +9554,14 @@ msgstr "메소드의 파라미터가 올바르지 않습니다." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9663,111 +9569,116 @@ msgstr "메소드의 파라미터가 올바르지 않습니다." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -9975,7 +9886,7 @@ msgstr[0] "아이템을 활성화 하였습니다" msgid "Item in \"not supported\" state" msgstr "아이템이 \"습득불가\" 상태" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "아이템이 선택되어 있지 않습니다" @@ -10153,7 +10064,7 @@ msgstr "아이템을 갱신하였습니다" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10346,7 +10257,7 @@ msgstr "라벨 위치" msgid "Language" msgstr "언어" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -10941,7 +10852,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11182,7 +11093,7 @@ msgid "Maximum time period to display is %1$s day." msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "표시 가능한 최대 기간은 %1$s일 입니다." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "ID \"%1$s\"의 미디어 타입의 메일주소가 최대 길이를 넘었습니다." @@ -11207,7 +11118,7 @@ msgstr "연락 방법" msgid "Media type" msgstr "연락 방법" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "미디어 타입 \"%1$s\"는 이미 존재합니다." @@ -11248,7 +11159,7 @@ msgstr "" msgid "Media type updated" msgstr "연락 방법을 갱신하였습니다" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "ID \"%1$s\"의 미디어 타입은 사용할 수 없습니다." @@ -11260,7 +11171,7 @@ msgstr "ID \"%1$s\"의 미디어 타입은 사용할 수 없습니다." msgid "Media types" msgstr "미디어 타입" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11502,7 +11413,7 @@ msgstr[0] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -11904,15 +11815,17 @@ msgstr "신규 대시보드" msgid "New element" msgstr "새 요소" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "새로운 이벤트의 호스트그룹" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "새로운 이벤트 태그의 값" @@ -11932,7 +11845,7 @@ msgstr "" msgid "New service time" msgstr "새 서비스 시간" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -11959,7 +11872,7 @@ msgstr "다음 스텝" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -11988,30 +11901,6 @@ msgstr "다음 스텝" msgid "No" msgstr "아니오" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "상관관계 \"%2$s\"에 \"%1$s\"가 정의되어 있지 않습니다." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "상관관계에 \"%1$s\"가 정의되어 있지 않습니다." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12061,11 +11950,6 @@ msgstr "인증사용자 명이 설정되어 있지 않습니다" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "상관관계\"%1$s\"에 조건의 타입이 정의되어 있지 않습니다." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12204,17 +12088,46 @@ msgstr "조건에 일치하는 데이터가 없습니다" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "상관관계 \"%1$s\"에 실행내용 타입이 정의되어 있지 않습니다." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "시스템 액세스 권한이 없습니다." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12250,10 +12163,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12281,13 +12193,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12307,8 +12224,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12331,24 +12248,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12370,16 +12287,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12435,7 +12352,7 @@ msgstr "트리거가 설정되어 있지 않습니다" msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "boolean이 아닌 플래그는 폐지될 예정입니다." @@ -12505,15 +12422,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "\"손님\" 사용자는 패스워드를 설정할 수 없습니다." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12847,15 +12764,16 @@ msgstr "OFF" msgid "Ok" msgstr "OK" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "오래된 이벤트 태그 값" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12877,10 +12795,6 @@ msgstr "한번" msgid "One" msgstr "1개" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "호스트 그룹이 설정되지 않은 오브젝트가 남아있습니다" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "한번만" @@ -12890,10 +12804,6 @@ msgstr "한번만" msgid "One-time downtime" msgstr "일시적인 정지 시간" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "최고관리자만 호스트 그룹을 작성할 수 있습니다." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Zabbix에이전트, SNMPv1, SNMPv2, SNMPv3의 유니크 여부를 체크합니다." @@ -12941,10 +12851,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "최고관리자만 상관관계를 작성할 수 있습니다." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "최고관리자만 대시보드의 권한을 설정할 수 있습니다." @@ -12953,10 +12859,6 @@ msgstr "최고관리자만 대시보드의 권한을 설정할 수 있습니다. msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "최고관리자만 상관관계를 갱신할 수 있습니다." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "활성화된 호스트와 아이템의 트리거만 카운트" @@ -13005,7 +12907,7 @@ msgstr "조작대상의 템플릿이 없습니다." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13014,33 +12916,33 @@ msgstr "" msgid "Operations" msgstr "오퍼레이션" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "오퍼레이터" @@ -13449,16 +13351,16 @@ msgstr "" msgid "Parameter" msgstr "파라미터" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "파라미터 \"%1$s\"는 폐지될 예정입니다." @@ -13595,7 +13497,7 @@ msgstr "" msgid "Paste without external links" msgstr "링크 없이 붙여넣기" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13641,7 +13543,7 @@ msgstr "DNS쿼리를 실행. 요구한 정보 타입의 string을 리턴." #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13774,7 +13676,7 @@ msgstr "호스트 인벤토리 필드의 자동설정" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14094,7 +13996,7 @@ msgstr "프록시" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14102,7 +14004,7 @@ msgstr "프록시" msgid "Proxy" msgstr "프록시" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14112,12 +14014,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "호스트 \"%2$s\"의 프록시 \"%1$s\"는 존재하지 앖습니다." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "프록시 \"%1$s\"는 액션 \"%2$s\"에서 사용되고 있습니다." -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "프록시 \"%1$s\"는 디스커버리 규칙 \"%2$s\"에 이용되어 있습니다." @@ -14391,7 +14293,7 @@ msgstr "Regular" msgid "Regular expression" msgstr "정규표현식" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14650,7 +14552,7 @@ msgid "Replace dependencies" msgstr "의존관계를 치환" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14847,7 +14749,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "결과" @@ -15088,7 +14990,7 @@ msgstr "SMTP 서버 포트 번호" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15383,7 +15285,7 @@ msgstr "범위" msgid "Script" msgstr "스크립트" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "스크립트 \"%1$s\"은 이미 존재합니다." @@ -15496,7 +15398,7 @@ msgid "Security name" msgstr "보안 이름" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15710,11 +15612,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "서비스시작시간은 종료시간보다 빠르게 설정해주십시오." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15726,7 +15628,7 @@ msgstr "" msgid "Service times" msgstr "서비스 시간" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "서비스 종류" @@ -15739,7 +15641,7 @@ msgstr "" msgid "Service updated" msgstr "서비스를 갱신하였습니다" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15751,7 +15653,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15769,9 +15671,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "세션이 끊겼습니다. 다시 로그인하여 주십시오." @@ -15833,7 +15735,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16678,10 +16580,10 @@ msgstr "테이블\"%1$s\"에 항목 이름 \"%2$s\"가 존재하지 않습니다 #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "태그" @@ -16818,7 +16720,7 @@ msgstr "템플릿" msgid "Template \"%1$s\" already exists." msgstr "템플릿\"%1$s\"은 이미 존재합니다." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -16902,7 +16804,7 @@ msgstr "같은 표시 이름\"%1$s\"를 지닌 템플릿이 이미 존재합니 #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17197,7 +17099,7 @@ msgstr "종료" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17600,7 +17502,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17664,9 +17566,9 @@ msgstr "2개의 타입요소를 선택할 필요가 있습니다" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17676,7 +17578,7 @@ msgstr "2개의 타입요소를 선택할 필요가 있습니다" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17728,7 +17630,7 @@ msgstr "데이터형" msgid "Types" msgstr "타입" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17799,8 +17701,8 @@ msgstr "맵 \"%1$s\"의 URL에는 \"name\"과 \"url\" 필드가 둘다 필요합 msgid "URLs" msgstr "URL" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -17910,21 +17812,23 @@ msgstr "단위" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "알 수 없음" @@ -17942,7 +17846,7 @@ msgid "Unknown error" msgstr "알 수 없는 에러" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "알 수 없는 아이템. 선택한 호스트에 그런 아이템은 존재하지 않습니다" @@ -18080,7 +17984,7 @@ msgstr "Up" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18214,37 +18118,37 @@ msgstr "액션에서 사용" msgid "User" msgstr "유저" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "유저 \"%1$s\"에 유저 그룹을 설정해주세요." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "유저 \"%1$s\"는 대시보드 \"%2$s\"의 소유자입니다." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "유저 \"%1$s\"는 맵 \"%2$s\"의 소유자입니다." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "유저 \"%1$s\"는 \"%2$s\" 액션 내에서 이용되고 있습니다." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18266,13 +18170,13 @@ msgstr "사용자를 추가하였습니다" msgid "User agent string" msgstr "유저 에이전트 문자열" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "사용자는 비활성의 그룹이나 GUI액세스가 비활성인 그룹에 자기자신을 추가할 수 없습니다." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18295,27 +18199,27 @@ msgstr[0] "사용자를 삭제하였습니다" msgid "User group" msgstr "유저 그룹" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "유저 그룹 \"%1$s\"은 이미 존재합니다." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "유저 그룹 \"%1$s\"는 \"%2$s\"액션 내에서 사용되고 있습니다." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "유저 그룹 \"%1$s\"는 데이터베이스 정지 메시지의 설정에 이용되고 있습니다." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "유저 그룹 \"%1$s\"는 스크립트\"%2$s\"에 이용되고 있습니다." @@ -18347,9 +18251,9 @@ msgstr[0] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "ID \"%1$s\"의 유저 그룹은 사용할 수 없습니다." @@ -18364,7 +18268,7 @@ msgstr "ID \"%1$s\"의 유저 그룹은 사용할 수 없습니다." msgid "User groups" msgstr "유저 그룹" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "자신의 사용자는 삭제할 수 없습니다." @@ -18399,7 +18303,7 @@ msgstr "유저 프로파일" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18417,7 +18321,7 @@ msgstr[0] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18466,12 +18370,12 @@ msgstr "사용자를 갱신하였습니다" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "ID \"%1$s\"의 유저는 사용할 수 없습니다." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18782,14 +18686,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -18901,11 +18805,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "임의 퍼포먼스 카운터 값. 리퀘스트에 따라 integer, float, string 혹은 text를 리턴." -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19440,7 +19345,7 @@ msgstr "연간" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19497,7 +19402,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19630,11 +19534,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "boolean을 지정해주세요" @@ -19642,16 +19546,16 @@ msgstr "boolean을 지정해주세요" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "문자열로 지정해 주십시오" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19660,37 +19564,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "숫자로 지정해주세요" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "숫자가 너무 큽니다" @@ -19711,7 +19615,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19719,19 +19623,19 @@ msgstr "" msgid "a time is expected" msgstr "시간으로 지정해주세요." -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "기간을 지정해주세요" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19781,7 +19685,7 @@ msgstr "전체" msgid "all media" msgstr "모든 미디어" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19803,23 +19707,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "배열로 지정해주세요" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "배열이나 문자열로 지정해주세요" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19829,7 +19733,7 @@ msgid "an empty string is expected" msgstr "공백문자(empty string)로 지정해 주십시오." #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "16진수 문자로 입력해주세요" @@ -19837,11 +19741,15 @@ msgstr "16진수 문자로 입력해주세요" msgid "an explicit time is expected" msgstr "구체적인 시간을 지정해 주십시오" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20002,13 +19910,7 @@ msgstr "변경할 수 없습니다" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20039,13 +19941,13 @@ msgstr "변경할 수 없습니다" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20063,14 +19965,14 @@ msgstr "변경할 수 없습니다" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20144,7 +20046,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "포함" @@ -20235,7 +20138,7 @@ msgstr "내림차순" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20257,13 +20160,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "포함하지 않음" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "같지 않음" @@ -20289,7 +20192,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20326,7 +20230,7 @@ msgstr "조건식이 지정되어있지 않습니다." msgid "failed to parse JSON" msgstr "JSON의 분석에 실패하였습니다." -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20417,7 +20321,7 @@ msgstr "아이콘" msgid "image" msgstr "이미지" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20462,15 +20366,19 @@ msgstr "요소의 수가 올바르지 않습니다" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "잘못된 서식이 \"%1$s\" 부근에서 발견되었습니다." -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20498,7 +20406,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "주소 범위 \"%1$s\"가 올바르지 않습니다" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "UTF-8의 바이트 시퀀스가 올바르지 않습니다" @@ -20527,27 +20435,27 @@ msgstr "" msgid "invalid history storage period" msgstr "히스토리의 보존기간이 올바르지 않습니다" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "호스트그룹명이 올바르지 않습니다" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "호스트의 이름이 올바르지 않습니다" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "정규표현식이 올바르지 않습니다" @@ -20575,7 +20483,7 @@ msgstr "이상" msgid "is less than or equals" msgstr "이하" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "{}로 포함되어 있지 않거나 잘못된 값입니다" @@ -20725,7 +20633,7 @@ msgstr "일치한다" msgid "max" msgstr "최대" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20765,7 +20673,7 @@ msgid "min() - Minimum value for period T" msgstr "min() - 기간T 안의 최소치" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "%1$s 문자 이상 입력해주세요" @@ -20792,8 +20700,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20814,8 +20722,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "적어도 하나 이상의 LLD 매크로를 포함할 필요가 있습니다." @@ -21031,6 +20939,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21076,11 +20988,11 @@ msgstr "" msgid "regular expression" msgstr "정규 표현" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21092,15 +21004,15 @@ msgstr "" msgid "right" msgstr "오른쪽" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21148,7 +21060,7 @@ msgstr "" msgid "short description" msgstr "짧은 설명" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21167,15 +21079,15 @@ msgstr "짧은 설명" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "비워주십시오" @@ -21191,31 +21103,31 @@ msgstr "아이콘의 매핑을 표시" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21223,15 +21135,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "sum() - 기간 T안의 합계치" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "지정된 자격 정보는 유니크 값이 아닙니다." @@ -21244,7 +21156,7 @@ msgstr "지정된 자격 정보는 유니크 값이 아닙니다." #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21255,7 +21167,7 @@ msgstr "지정된 자격 정보는 유니크 값이 아닙니다." msgid "tag" msgstr "태그" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21264,14 +21176,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "템플릿ID \"%1$s\"가 %2$s번 사용되고 있습니다" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21283,20 +21195,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "파라미터 \"%1$s\" 가 없습니다" @@ -21328,7 +21240,7 @@ msgstr "제3" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21336,31 +21248,31 @@ msgstr "" msgid "time shift" msgstr "타임시프트" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "time() - 현재시간" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft() - 기간T를 기준으로 하여 지정한 값에 도달하기 까지의 시간" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21374,7 +21286,7 @@ msgstr "트리거" msgid "trigger does not allow manual closing" msgstr "트리거는 수동 클로즈가 허가되어 있지 않습니다." -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21386,11 +21298,11 @@ msgstr "트리거 프로토타입은 다른 템플릿이나 호스트에 이동 msgid "trigger with linkages cannot be moved to another template or host" msgstr "링크가 있는 트리거는 다른 템플릿이나 호스트로 이동할 수 없습니다" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21399,7 +21311,7 @@ msgstr "" msgid "type here to search" msgstr "검색 문자열을 입력" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21447,11 +21359,12 @@ msgstr "매크로의 끝부분이 잘못되어 있습니다" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "파라미터 \"%1$s\" 가 잘못되었습니다" @@ -21477,8 +21390,8 @@ msgstr "텍스트 \"%1$s\"가 잘못되었습니다." #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21503,6 +21416,10 @@ msgstr "" msgid "unsupported version number" msgstr "지원되지 않는 버전의 번호입니다." +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21560,61 +21477,67 @@ msgstr "값 \"%1$s\"가 존재하지 않습니다" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "값 %1$s는 이미 존재합니다" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "값이 너무 깁니다" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21645,15 +21568,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "값은 %1$s부터 지정해주세요" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21662,7 +21583,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21675,11 +21596,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/lt/LC_MESSAGES/frontend.po b/ui/locale/lt/LC_MESSAGES/frontend.po index 91bc5c9ab70..75bab562ba8 100644 --- a/ui/locale/lt/LC_MESSAGES/frontend.po +++ b/ui/locale/lt/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2013-10-10 08:29+0300\n" "Last-Translator: richlv <richlv@nakts.net>\n" "Language-Team: none\n" @@ -520,7 +520,7 @@ msgstr "Pripažinimas" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Pripažintas" @@ -619,7 +619,7 @@ msgstr "" msgid "Action \"%1$s\" no operations defined." msgstr "" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -747,7 +747,7 @@ msgstr "Aktyvus iki" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -758,7 +758,7 @@ msgstr "Aktyvus iki" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -1014,7 +1014,7 @@ msgstr "Laikotarpis mažesnis už" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1336,7 +1336,7 @@ msgstr "Ties (valanda:minutė)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1345,8 +1345,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1357,6 +1357,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1368,7 +1373,7 @@ msgstr "Bent vienas priežiūros periodas turi būti sukurtas." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1454,7 +1459,7 @@ msgstr "Autentifikacija" msgid "Authentication algorithm" msgstr "Autentifikacijos algoritmas" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1503,7 +1508,7 @@ msgstr "" msgid "Auto-login" msgstr "Automatinis prisijungimas" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1514,7 +1519,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1773,7 +1778,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1808,7 +1813,7 @@ msgstr "Atgalinis skambutis" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -2015,7 +2020,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2141,7 +2146,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "" @@ -2150,7 +2155,7 @@ msgstr "" msgid "Cannot delete action" msgstr "" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2221,7 +2226,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2296,7 +2301,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2322,7 +2327,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "" @@ -2741,16 +2746,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2764,7 +2769,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "" @@ -2786,7 +2791,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2848,7 +2853,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "" @@ -2932,7 +2937,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "" @@ -2945,7 +2950,7 @@ msgstr "" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -3007,8 +3012,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -3069,9 +3075,7 @@ msgstr "" msgid "Cannot update group" msgstr "" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -3156,12 +3160,12 @@ msgstr "" msgid "Cannot update proxy" msgstr "" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3181,9 +3185,9 @@ msgstr "" msgid "Cannot update script" msgstr "" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3368,8 +3372,8 @@ msgid "Character string not included" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3545,7 +3549,7 @@ msgstr "" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3583,13 +3587,13 @@ msgstr "" msgid "Close expression constructor" msgstr "" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3686,7 +3690,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3697,11 +3701,6 @@ msgstr "" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3717,11 +3716,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3913,7 +3907,7 @@ msgstr "" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4115,12 +4109,11 @@ msgstr "" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4150,16 +4143,6 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4170,8 +4153,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "" @@ -4543,7 +4526,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "" @@ -4819,8 +4802,8 @@ msgstr "" msgid "December" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4830,7 +4813,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4927,7 +4910,7 @@ msgstr "" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4977,7 +4960,7 @@ msgstr "" msgid "Delete current action?" msgstr "" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5275,7 +5258,7 @@ msgstr "" msgid "Dependencies" msgstr "" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "" @@ -5283,7 +5266,7 @@ msgstr "" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5492,10 +5475,10 @@ msgstr "" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5578,7 +5561,7 @@ msgid "Discovery by proxy" msgstr "" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "" @@ -5590,7 +5573,7 @@ msgstr "" msgid "Discovery list" msgstr "" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "" @@ -5692,7 +5675,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5703,7 +5686,7 @@ msgstr "" msgid "Discovery rules deleted" msgstr "" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "" @@ -5859,18 +5842,6 @@ msgstr "" msgid "Draw style" msgstr "" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5883,11 +5854,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -6047,10 +6013,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6077,11 +6039,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6266,7 +6226,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6277,7 +6237,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6320,7 +6280,7 @@ msgid "English (en_US)" msgstr "" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6395,7 +6355,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6430,11 +6390,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6771,7 +6731,6 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7139,7 +7098,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7385,12 +7344,12 @@ msgstr "" msgid "Group" msgstr "" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7724,7 +7683,7 @@ msgstr[2] "" msgid "Host \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7732,7 +7691,7 @@ msgstr "" msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7805,17 +7764,17 @@ msgstr[2] "" msgid "Host group" msgstr "" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7829,9 +7788,9 @@ msgid "Host group label type" msgstr "" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7847,8 +7806,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -8036,7 +7995,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8124,7 +8083,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "" @@ -8149,7 +8108,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8206,12 +8165,12 @@ msgstr "" msgid "Icon map" msgstr "" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "" @@ -8235,7 +8194,7 @@ msgstr "" msgid "Icon mapping" msgstr "" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8468,7 +8427,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8481,11 +8440,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8697,24 +8656,6 @@ msgstr "" msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "" -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8799,20 +8740,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8877,11 +8809,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8989,7 +8916,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -9103,11 +9030,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9129,10 +9051,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9194,18 +9116,6 @@ msgstr "" msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9267,12 +9177,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9384,7 +9288,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9395,9 +9299,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9548,7 +9452,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "" @@ -9676,7 +9580,7 @@ msgstr "" msgid "Interval" msgstr "" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9699,7 +9603,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9713,7 +9617,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9760,9 +9664,11 @@ msgstr "" #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9802,17 +9708,17 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9820,14 +9726,14 @@ msgstr "" #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9835,111 +9741,116 @@ msgstr "" #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10153,7 +10064,7 @@ msgstr[2] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10333,7 +10244,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10526,7 +10437,7 @@ msgstr "" msgid "Language" msgstr "" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11133,7 +11044,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11376,7 +11287,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11401,7 +11312,7 @@ msgstr "" msgid "Media type" msgstr "" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11448,7 +11359,7 @@ msgstr "" msgid "Media type updated" msgstr "" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11460,7 +11371,7 @@ msgstr "" msgid "Media types" msgstr "" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11712,7 +11623,7 @@ msgstr[2] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12114,15 +12025,17 @@ msgstr "" msgid "New element" msgstr "" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12142,7 +12055,7 @@ msgstr "" msgid "New service time" msgstr "" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12169,7 +12082,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12198,30 +12111,6 @@ msgstr "" msgid "No" msgstr "" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12271,11 +12160,6 @@ msgstr "" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12414,17 +12298,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12460,10 +12373,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12491,13 +12403,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12517,8 +12434,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12541,24 +12458,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12580,16 +12497,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12645,7 +12562,7 @@ msgstr "" msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12715,15 +12632,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -13057,15 +12974,16 @@ msgstr "" msgid "Ok" msgstr "" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -13087,10 +13005,6 @@ msgstr "" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "" @@ -13100,10 +13014,6 @@ msgstr "" msgid "One-time downtime" msgstr "" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "" - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -13153,10 +13063,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13165,10 +13071,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "" @@ -13217,7 +13119,7 @@ msgstr "" msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13226,33 +13128,33 @@ msgstr "" msgid "Operations" msgstr "" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "" @@ -13661,16 +13563,16 @@ msgstr "" msgid "Parameter" msgstr "" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13807,7 +13709,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13853,7 +13755,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13986,7 +13888,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14306,7 +14208,7 @@ msgstr "" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14314,7 +14216,7 @@ msgstr "" msgid "Proxy" msgstr "" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14324,12 +14226,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "" -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "" @@ -14605,7 +14507,7 @@ msgstr "" msgid "Regular expression" msgstr "" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14866,7 +14768,7 @@ msgid "Replace dependencies" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -15063,7 +14965,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "" @@ -15304,7 +15206,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15605,7 +15507,7 @@ msgstr "" msgid "Script" msgstr "" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15720,7 +15622,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15935,11 +15837,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "" -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15951,7 +15853,7 @@ msgstr "" msgid "Service times" msgstr "" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "" @@ -15964,7 +15866,7 @@ msgstr "" msgid "Service updated" msgstr "" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15976,7 +15878,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15994,9 +15896,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "" @@ -16058,7 +15960,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16903,10 +16805,10 @@ msgstr "" #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "" @@ -17043,7 +16945,7 @@ msgstr "" msgid "Template \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17127,7 +17029,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17426,7 +17328,7 @@ msgstr "" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17837,7 +17739,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17901,9 +17803,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17913,7 +17815,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17965,7 +17867,7 @@ msgstr "" msgid "Types" msgstr "" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -18036,8 +17938,8 @@ msgstr "" msgid "URLs" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18147,21 +18049,23 @@ msgstr "" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "" @@ -18179,7 +18083,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "" @@ -18319,7 +18223,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18453,37 +18357,37 @@ msgstr "" msgid "User" msgstr "" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18505,13 +18409,13 @@ msgstr "" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "" #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18536,27 +18440,27 @@ msgstr[2] "" msgid "User group" msgstr "" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "" @@ -18592,9 +18496,9 @@ msgstr[2] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18609,7 +18513,7 @@ msgstr "" msgid "User groups" msgstr "" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "" @@ -18644,7 +18548,7 @@ msgstr "" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18664,7 +18568,7 @@ msgstr[2] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18715,12 +18619,12 @@ msgstr "" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -19031,14 +18935,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19150,11 +19054,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19693,7 +19598,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19750,7 +19655,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19883,11 +19787,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19895,16 +19799,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19913,37 +19817,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19964,7 +19868,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19972,19 +19876,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -20034,7 +19938,7 @@ msgstr "" msgid "all media" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -20056,23 +19960,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -20082,7 +19986,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -20090,11 +19994,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20255,13 +20163,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20292,13 +20194,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20316,14 +20218,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20396,7 +20298,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20487,7 +20390,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20509,13 +20412,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20541,7 +20444,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20578,7 +20482,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20669,7 +20573,7 @@ msgstr "" msgid "image" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20714,15 +20618,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20750,7 +20658,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20779,27 +20687,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20827,7 +20735,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20977,7 +20885,7 @@ msgstr "" msgid "max" msgstr "" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -21017,7 +20925,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -21044,8 +20952,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -21066,8 +20974,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21283,6 +21191,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21328,11 +21240,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21344,15 +21256,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21400,7 +21312,7 @@ msgstr "" msgid "short description" msgstr "" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21419,15 +21331,15 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21443,31 +21355,31 @@ msgstr "" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21475,15 +21387,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21496,7 +21408,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21507,7 +21419,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21516,14 +21428,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21535,20 +21447,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21580,7 +21492,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21588,31 +21500,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21626,7 +21538,7 @@ msgstr "" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21638,11 +21550,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21651,7 +21563,7 @@ msgstr "" msgid "type here to search" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21699,11 +21611,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21729,8 +21642,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21755,6 +21668,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21812,61 +21729,71 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21897,15 +21824,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21914,7 +21839,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21927,11 +21852,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/lv/LC_MESSAGES/frontend.po b/ui/locale/lv/LC_MESSAGES/frontend.po index 8c9a5415737..581ab43b175 100644 --- a/ui/locale/lv/LC_MESSAGES/frontend.po +++ b/ui/locale/lv/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2013-10-15 07:19+0300\n" "Last-Translator: Jaba <janis.jaunbalodis@gmail.com>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -520,7 +520,7 @@ msgstr "Apstiprinājums" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Apstiprināts" @@ -619,7 +619,7 @@ msgstr "" msgid "Action \"%1$s\" no operations defined." msgstr "" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -747,7 +747,7 @@ msgstr "Aktīvs līdz" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -758,7 +758,7 @@ msgstr "Aktīvs līdz" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -1016,7 +1016,7 @@ msgstr "Vecums mazāks par" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1338,7 +1338,7 @@ msgstr "" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1347,8 +1347,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1359,6 +1359,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1370,7 +1375,7 @@ msgstr "" msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1456,7 +1461,7 @@ msgstr "Autentifikācija" msgid "Authentication algorithm" msgstr "Autentifikācijas algoritms" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1505,7 +1510,7 @@ msgstr "" msgid "Auto-login" msgstr "Automātiska pieteikšanās" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1516,7 +1521,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1775,7 +1780,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1810,7 +1815,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -2017,7 +2022,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2143,7 +2148,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "" @@ -2152,7 +2157,7 @@ msgstr "" msgid "Cannot delete action" msgstr "" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2224,7 +2229,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2299,7 +2304,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2325,7 +2330,7 @@ msgstr[0] "Skriptu nav iespējams izdzēst" msgstr[1] "Skriptu nav iespējams izdzēst" msgstr[2] "Skriptu nav iespējams izdzēst" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "" @@ -2745,16 +2750,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2768,7 +2773,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "" @@ -2790,7 +2795,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2852,7 +2857,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "" @@ -2936,7 +2941,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "" @@ -2949,7 +2954,7 @@ msgstr "" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -3011,8 +3016,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -3073,9 +3079,7 @@ msgstr "" msgid "Cannot update group" msgstr "" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -3160,12 +3164,12 @@ msgstr "" msgid "Cannot update proxy" msgstr "" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3185,9 +3189,9 @@ msgstr "" msgid "Cannot update script" msgstr "Nevar modificēt skriptu" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3372,8 +3376,8 @@ msgid "Character string not included" msgstr "Simbolu rinda nav iekļauta" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3549,7 +3553,7 @@ msgstr "Pulkstenis" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3587,13 +3591,13 @@ msgstr "Aizvērt" msgid "Close expression constructor" msgstr "" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3690,7 +3694,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3701,11 +3705,6 @@ msgstr "Nosacījums" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3721,11 +3720,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3917,7 +3911,7 @@ msgstr "Apstiprinājuma teksts" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4119,12 +4113,11 @@ msgstr "Kopēt" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4154,16 +4147,6 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4174,8 +4157,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Skaits" @@ -4547,7 +4530,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS vārds" @@ -4823,8 +4806,8 @@ msgstr "Dec" msgid "December" msgstr "Decembris" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4834,7 +4817,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4931,7 +4914,7 @@ msgstr "Aizkave pēc" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4981,7 +4964,7 @@ msgstr "" msgid "Delete current action?" msgstr "" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5279,7 +5262,7 @@ msgstr "" msgid "Dependencies" msgstr "" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "" @@ -5287,7 +5270,7 @@ msgstr "" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5496,10 +5479,10 @@ msgstr "" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5582,7 +5565,7 @@ msgid "Discovery by proxy" msgstr "" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "" @@ -5594,7 +5577,7 @@ msgstr "" msgid "Discovery list" msgstr "" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "" @@ -5696,7 +5679,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5707,7 +5690,7 @@ msgstr "" msgid "Discovery rules deleted" msgstr "" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "" @@ -5863,18 +5846,6 @@ msgstr "" msgid "Draw style" msgstr "" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5887,11 +5858,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -6051,10 +6017,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6081,11 +6043,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6270,7 +6230,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6281,7 +6241,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6324,7 +6284,7 @@ msgid "English (en_US)" msgstr "Angļu (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6400,7 +6360,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6435,11 +6395,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6776,7 +6736,6 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7144,7 +7103,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7390,12 +7349,12 @@ msgstr "Režģis" msgid "Group" msgstr "Grupa" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7731,7 +7690,7 @@ msgstr[2] "Iekārta" msgid "Host \"%1$s\" already exists." msgstr "Iekārta \"%1$s\" jau eksistē." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7739,7 +7698,7 @@ msgstr "Iekārta \"%1$s\" jau eksistē." msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7812,17 +7771,17 @@ msgstr[2] "" msgid "Host group" msgstr "Iekārtas grupa" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Iekārtas grupa \"%1$s\" jau eksistē." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7836,9 +7795,9 @@ msgid "Host group label type" msgstr "" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7854,8 +7813,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -8043,7 +8002,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8131,7 +8090,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP adrese" @@ -8156,7 +8115,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8213,12 +8172,12 @@ msgstr "" msgid "Icon map" msgstr "" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "" @@ -8242,7 +8201,7 @@ msgstr "" msgid "Icon mapping" msgstr "" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8475,7 +8434,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8488,11 +8447,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8704,24 +8663,6 @@ msgstr "" msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "" -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8806,20 +8747,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8884,11 +8816,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8996,7 +8923,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -9110,11 +9037,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9136,10 +9058,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9201,18 +9123,6 @@ msgstr "" msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9274,12 +9184,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9391,7 +9295,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9402,9 +9306,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9555,7 +9459,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Ievietot" @@ -9683,7 +9587,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Intervāls" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9706,7 +9610,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9720,7 +9624,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9767,9 +9671,11 @@ msgstr "" #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9809,17 +9715,17 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9827,14 +9733,14 @@ msgstr "" #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9842,111 +9748,116 @@ msgstr "" #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10160,7 +10071,7 @@ msgstr[2] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10340,7 +10251,7 @@ msgstr "Rādītāji atjaunoti" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10533,7 +10444,7 @@ msgstr "Iezīmes izvietojums" msgid "Language" msgstr "Valoda" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11140,7 +11051,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11383,7 +11294,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11408,7 +11319,7 @@ msgstr "" msgid "Media type" msgstr "" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11455,7 +11366,7 @@ msgstr "" msgid "Media type updated" msgstr "" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11467,7 +11378,7 @@ msgstr "" msgid "Media types" msgstr "" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11719,7 +11630,7 @@ msgstr[2] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12121,15 +12032,17 @@ msgstr "" msgid "New element" msgstr "Jauns elements" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12149,7 +12062,7 @@ msgstr "" msgid "New service time" msgstr "" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12176,7 +12089,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12205,30 +12118,6 @@ msgstr "" msgid "No" msgstr "Nē" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12278,11 +12167,6 @@ msgstr "" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12421,17 +12305,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12467,10 +12380,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12498,13 +12410,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12524,8 +12441,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12548,24 +12465,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12587,16 +12504,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12652,7 +12569,7 @@ msgstr "" msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12722,15 +12639,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -13064,15 +12981,16 @@ msgstr "" msgid "Ok" msgstr "Apstiprināt" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -13094,10 +13012,6 @@ msgstr "Vienreiz" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "" @@ -13107,10 +13021,6 @@ msgstr "" msgid "One-time downtime" msgstr "" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "" - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -13160,10 +13070,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13172,10 +13078,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "" @@ -13224,7 +13126,7 @@ msgstr "" msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13233,33 +13135,33 @@ msgstr "" msgid "Operations" msgstr "Operācija" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operators" @@ -13668,16 +13570,16 @@ msgstr "" msgid "Parameter" msgstr "Parametrs" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13814,7 +13716,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13860,7 +13762,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13993,7 +13895,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14313,7 +14215,7 @@ msgstr "Starpniekserveri" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14321,7 +14223,7 @@ msgstr "Starpniekserveri" msgid "Proxy" msgstr "Starpniekserveris" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14331,12 +14233,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "" -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "" @@ -14612,7 +14514,7 @@ msgstr "" msgid "Regular expression" msgstr "Regulārā izteiksme" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14873,7 +14775,7 @@ msgid "Replace dependencies" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -15070,7 +14972,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Rezultāts" @@ -15311,7 +15213,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15612,7 +15514,7 @@ msgstr "" msgid "Script" msgstr "Skripts" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Skripts \"%1$s\" jau eksistē." @@ -15727,7 +15629,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15942,11 +15844,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "" -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15958,7 +15860,7 @@ msgstr "" msgid "Service times" msgstr "" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Servisa tips" @@ -15971,7 +15873,7 @@ msgstr "" msgid "Service updated" msgstr "" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15983,7 +15885,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -16001,9 +15903,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "" @@ -16065,7 +15967,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16910,10 +16812,10 @@ msgstr "" #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "" @@ -17050,7 +16952,7 @@ msgstr "Šablons" msgid "Template \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17134,7 +17036,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17433,7 +17335,7 @@ msgstr "Līdz" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17844,7 +17746,7 @@ msgstr "Trigeris atjaunots" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17908,9 +17810,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17920,7 +17822,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17972,7 +17874,7 @@ msgstr "Informācijas tips" msgid "Types" msgstr "Tipi" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -18043,8 +17945,8 @@ msgstr "" msgid "URLs" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18154,21 +18056,23 @@ msgstr "Vienības" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Nav zināms" @@ -18186,7 +18090,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "" @@ -18326,7 +18230,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18460,37 +18364,37 @@ msgstr "" msgid "User" msgstr "Lietotājs" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18512,13 +18416,13 @@ msgstr "Lietotājs pievienots" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "" #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18543,27 +18447,27 @@ msgstr[2] "" msgid "User group" msgstr "Lietotāju grupa" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "" @@ -18599,9 +18503,9 @@ msgstr[2] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18616,7 +18520,7 @@ msgstr "" msgid "User groups" msgstr "Lietotāju grupas" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Lietotājam nav atļauts dzēst sevi." @@ -18651,7 +18555,7 @@ msgstr "Lietotāja profils" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18671,7 +18575,7 @@ msgstr[2] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18722,12 +18626,12 @@ msgstr "Lietotāja dati atjaunoti" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -19038,14 +18942,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19157,11 +19061,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19700,7 +19605,7 @@ msgstr "Ik gadu" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19757,7 +19662,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19890,11 +19794,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19902,16 +19806,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19920,37 +19824,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19971,7 +19875,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19979,19 +19883,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -20041,7 +19945,7 @@ msgstr "visi" msgid "all media" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -20063,23 +19967,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -20089,7 +19993,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -20097,11 +20001,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20262,13 +20170,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20299,13 +20201,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20323,14 +20225,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20403,7 +20305,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20494,7 +20397,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20516,13 +20419,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20548,7 +20451,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20585,7 +20489,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20676,7 +20580,7 @@ msgstr "ikona" msgid "image" msgstr "attēls" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20721,15 +20625,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20757,7 +20665,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20786,27 +20694,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20834,7 +20742,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20984,7 +20892,7 @@ msgstr "" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -21024,7 +20932,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -21051,8 +20959,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -21073,8 +20981,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21290,6 +21198,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21335,11 +21247,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21351,15 +21263,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21407,7 +21319,7 @@ msgstr "" msgid "short description" msgstr "īss apraksts" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21426,15 +21338,15 @@ msgstr "īss apraksts" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21450,31 +21362,31 @@ msgstr "parādīt ikonu plānojumu" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21482,15 +21394,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21503,7 +21415,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21514,7 +21426,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21523,14 +21435,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "veidne ID \"%1$s\" ir nodota %2$s reizes" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21542,20 +21454,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21587,7 +21499,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21595,31 +21507,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21633,7 +21545,7 @@ msgstr "trigeris" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21645,11 +21557,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21658,7 +21570,7 @@ msgstr "" msgid "type here to search" msgstr "ieraksti ko meklēt" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21706,11 +21618,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21736,8 +21649,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21762,6 +21675,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21819,61 +21736,71 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21904,15 +21831,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21921,7 +21846,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21934,11 +21859,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/nb/LC_MESSAGES/frontend.po b/ui/locale/nb/LC_MESSAGES/frontend.po index 865aeea1b33..7f918fc9d33 100644 --- a/ui/locale/nb/LC_MESSAGES/frontend.po +++ b/ui/locale/nb/LC_MESSAGES/frontend.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Zabbix 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2021-03-19 18:13+0300\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: none\n" @@ -504,7 +504,7 @@ msgstr "Bekrefte" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Bekreftet" @@ -603,7 +603,7 @@ msgstr "Handling \"%1$s\" eksisterer allerede." msgid "Action \"%1$s\" no operations defined." msgstr "Handling \"%1$s\" ingen operasjoner definert." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -729,7 +729,7 @@ msgstr "Aktiv til" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -740,7 +740,7 @@ msgstr "Aktiv til" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -996,7 +996,7 @@ msgstr "Alder mindre enn" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1318,7 +1318,7 @@ msgstr "På (time: minutt)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1327,8 +1327,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1339,6 +1339,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1350,7 +1355,7 @@ msgstr "Minst en vedlikeholdsperiode må opprettes." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1436,7 +1441,7 @@ msgstr "Autentisering" msgid "Authentication algorithm" msgstr "Autentiseringsalgoritme" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1485,7 +1490,7 @@ msgstr "" msgid "Auto-login" msgstr "Automatisk innlogging" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Auto-innlogging og automatisk utlogging kan ikke aktiveres sammen." @@ -1496,7 +1501,7 @@ msgstr "Auto-avlogging" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1755,7 +1760,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1790,7 +1795,7 @@ msgstr "Ring tilbake" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1996,7 +2001,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2118,7 +2123,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Kan ikke slette Zabbix intern bruker \"%1$s\", prøv å deaktivere brukeren." @@ -2127,7 +2132,7 @@ msgstr "Kan ikke slette Zabbix intern bruker \"%1$s\", prøv å deaktivere bruke msgid "Cannot delete action" msgstr "Kan ikke slette handling" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2195,7 +2200,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2266,7 +2271,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "Kan ikke slette proxy" msgstr[1] "Kan ikke slette proxyer" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2289,7 +2294,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "Kan ikke slette skript" msgstr[1] "Kan ikke slette skriptene" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Kan ikke slette skript. Skriptet \"%1$s\" brukes i handlingsoperasjon \"%2$s\"." @@ -2683,16 +2688,16 @@ msgstr "Kan ikke finne verdikart \"%1$s\" brukt til elementprototype \"%2$s\" av msgid "Cannot have empty visible template name." msgstr "Kan ikke ha tomt synlig malnavn." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2705,7 +2710,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "Kan ikke importere mal \"%1$s\", koblet mal \"%2$s\" eksisterer ikke." msgstr[1] "Kan ikke importere mal \"%1$s\", koblete maler \"%2$s\" eksisterer ikke." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Kan ikke sette inn trigger-uttrykk" @@ -2726,7 +2731,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2788,7 +2793,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Kan ikke lese svaret, sjekk forbindelsen med Zabbix-serveren \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Kan ikke gi nytt navn til gjestebruker." @@ -2871,7 +2876,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Kan ikke oppheve og slette webscenarier." @@ -2884,7 +2889,7 @@ msgstr "Kan ikke koble fra mal" msgid "Cannot unlink template." msgstr "Kan ikke koble fra mal." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2946,9 +2951,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Kan ikke oppdatere en oppdaget graf." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Kan ikke oppdatere en oppdaget vertsgruppe." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3007,9 +3013,7 @@ msgstr "Kan ikke oppdatere graf prototype" msgid "Cannot update group" msgstr "Kan ikke oppdatere gruppe" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Kan ikke oppdatere grupper for oppdaget vert \"%1$s\"." @@ -3092,12 +3096,12 @@ msgstr "Kan ikke oppdatere nettverkskart" msgid "Cannot update proxy" msgstr "Kan ikke oppdatere proxy" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Kan ikke oppdatere proxy for oppdaget vert \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3117,9 +3121,9 @@ msgstr "" msgid "Cannot update script" msgstr "Kan ikke oppdatere skript" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3302,8 +3306,8 @@ msgid "Character string not included" msgstr "Tegnstreng er ikke inkludert" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3479,7 +3483,7 @@ msgstr "Klokke" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3517,13 +3521,13 @@ msgstr "Lukk" msgid "Close expression constructor" msgstr "Lukk uttrykkskonstruksjon" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Lukk ny hendelse" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Lukk gamle arrangementer" @@ -3620,7 +3624,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "Samtidige økter" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3631,11 +3635,6 @@ msgstr "Tilstand" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "Tilstand \"%2$s\" brukes ikke i formelen \"%3$s\" for handling \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "Tilstand \"%2$s\" brukes ikke i formelen \"%3$s\" for korrelasjon \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3651,11 +3650,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "Tilstand \"%2$s\" brukt i formelen \"%3$s\" for handling \"%1$s\" er ikke definert." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "Tilstand \"%2$s\" brukt i formelen \"%3$s\" for korrelasjon \"%1$s\" er ikke definert." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3847,7 +3841,7 @@ msgstr "Bekreftelsestekst" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Gratulerer! Du har installert Zabbix frontend." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4049,12 +4043,11 @@ msgstr "Kopier" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Korrelasjon" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "Korrelasjon \"%1$s\" eksisterer allerede." @@ -4082,16 +4075,6 @@ msgid_plural "Correlations enabled" msgstr[0] "Korrelasjon aktivert" msgstr[1] "Korrelasjoner aktivert" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "Korrelasjon mangler parametere: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "Korrelasjonsnavnet kan ikke være tomt." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Korrelasjonsregel" @@ -4102,8 +4085,8 @@ msgstr "Korrelasjon oppdatert" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Teller" @@ -4475,7 +4458,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS-navn" @@ -4750,8 +4733,8 @@ msgstr "Des" msgid "December" msgstr "Desember" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4761,7 +4744,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4858,7 +4841,7 @@ msgstr "Forsinket av" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4908,7 +4891,7 @@ msgstr "Slett og fjern mal? (Advarsel: alle tilknyttede verter blir ryddet!)" msgid "Delete current action?" msgstr "Slett nåværende handling?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Slett nåværende korrelasjon?" @@ -5206,7 +5189,7 @@ msgstr "" msgid "Dependencies" msgstr "avhengig" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Avhengig" @@ -5214,7 +5197,7 @@ msgstr "Avhengig" msgid "Dependent item" msgstr "Avhengige gjenstand" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5423,10 +5406,10 @@ msgstr "Deaktiver valgte webscenarier?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5509,7 +5492,7 @@ msgid "Discovery by proxy" msgstr "Oppdagelse ved fullmakt" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Discovery sjekk" @@ -5521,7 +5504,7 @@ msgstr "Discovery sjekker" msgid "Discovery list" msgstr "Oppdagelsesliste" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Discovery-objekt" @@ -5621,7 +5604,7 @@ msgstr "Oppdagelsesregel oppdatert" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5632,7 +5615,7 @@ msgstr "Discovery regler" msgid "Discovery rules deleted" msgstr "Discovery regler slettet" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Discovery status" @@ -5788,18 +5771,6 @@ msgstr "" msgid "Draw style" msgstr "Tegn stil" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "Dupliser \"%1$s\" verdi \"%2$s\" for korrelasjon \"%3$s\"." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Dupliser \"%1$s\" verdi \"%2$s\" for korrelasjon." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5812,11 +5783,6 @@ msgstr "Dupliser \"navn\" verdi \"%1$s\" for kart." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5976,10 +5942,6 @@ msgstr "Tøm SSL-nøkkelfil for webscenario \"%1$s\"." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "Tom korrelasjons-ID." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6006,11 +5968,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6195,7 +6155,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6206,7 +6166,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6249,7 +6209,7 @@ msgid "English (en_US)" msgstr "Engelsk (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6325,7 +6285,7 @@ msgid "Event correlation" msgstr "Hendelse korrelasjon" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Hendelse korrelasjonsregler" @@ -6360,11 +6320,11 @@ msgstr "Hendelsesloggovervåking. Returnerer logg" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Event tag par" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Hendelses type" @@ -6700,7 +6660,6 @@ msgstr "Feltet \"%1$s\" kan ikke settes til NULL." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7068,7 +7027,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Gitt uttrykk er ikke en makro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "Globalt vanlig uttrykk \"%1$s\" eksisterer ikke." @@ -7313,12 +7272,12 @@ msgstr "Rutenett" msgid "Group" msgstr "Gruppe" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Gruppe \"%1$s\" kan ikke slettes fordi den brukes av en vert prototype." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "Gruppe \"%1$s\" kan ikke slettes fordi den brukes i en korrelasjonsbetingelse." @@ -7650,7 +7609,7 @@ msgstr[1] "Verter" msgid "Host \"%1$s\" already exists." msgstr "Verten \"%1$s\" eksisterer allerede." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7658,7 +7617,7 @@ msgstr "Verten \"%1$s\" eksisterer allerede." msgid "Host \"%1$s\" cannot be without host group." msgstr "Verten \"%1$s\" kan ikke være uten vertsgruppe." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7729,17 +7688,17 @@ msgstr[1] "Verter aktivert" msgid "Host group" msgstr "Vertsgruppe" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Vertsgruppen \"%1$s\" eksisterer allerede." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Vertsgruppen \"%1$s\" kan ikke slettes fordi den brukes i et globalt skript." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7753,9 +7712,9 @@ msgid "Host group label type" msgstr "Vertsgruppe etikett type" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "Vertsgruppe med ID \"%1$s\" er ikke tilgjengelig." @@ -7771,8 +7730,8 @@ msgstr "Vertsgruppe med ID \"%1$s\" er ikke tilgjengelig." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7959,7 +7918,7 @@ msgstr "Vert med samme synlige navn \"%1$s\" eksisterer allerede." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8047,7 +8006,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP-adresse" @@ -8072,7 +8031,7 @@ msgstr "IP-området \"%1$s\" overstiger \"%2$s\" adresse grense" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8129,12 +8088,12 @@ msgstr "Ikon høydepunkt" msgid "Icon map" msgstr "Ikon kart" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Ikonkartet \"%1$s\" kan ikke slettes. Brukes i kart \"%2$s\"." @@ -8158,7 +8117,7 @@ msgstr "Ikonkart oppdatert" msgid "Icon mapping" msgstr "Ikon kartlegging" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "Ikon med ID \"%1$s\" er ikke tilgjengelig." @@ -8389,7 +8348,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8402,11 +8361,11 @@ msgstr "Utilgjengelig kart" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8618,24 +8577,6 @@ msgstr "Feil handling operasjon brukergruppe. Brukergruppe eksisterer ikke, elle msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Feil handling operatør bruker. Brukeren eksisterer ikke, eller du har ingen tilgang til denne brukeren." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8720,20 +8661,11 @@ msgstr "Feil forhold for handling \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Feil vilkår for oppdagelsesregel \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "Feil korrelasjons-ID." - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "Feil tilpasset uttrykk \"%2$s\" for handling \"%1$s\": %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "Feil tilpasset uttrykk \"%2$s\" for korrelasjon \"%1$s\": %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8798,11 +8730,6 @@ msgstr "Feil filterbetingelsesformel ID for handling \"%1$s\"." msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Feil filterbetingelsesformel ID for oppdagelsesregel \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "Feil filterbetingelsesformel ID gitt for korrelasjon \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8910,7 +8837,7 @@ msgstr "Feil kart-ID." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Feil metode \"%1$s.%2$s\"." @@ -9024,11 +8951,6 @@ msgstr "Feil utløse prototypeuttrykk. Trigger prototype uttrykk elementer bør msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Feil type beregning for handling \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "Feil type beregning for korrelasjon \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9050,10 +8972,10 @@ msgstr "Feil bruker-ID angitt for kart \"%1$s\"." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "Feil brukergruppen ID spesifisert for kart \"%1$s\"." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9115,18 +9037,6 @@ msgstr "Feil verdi \"%1$s\" for int felt \"%2$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Feil verdi \"%1$s\" for usignert int felt \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "Feil verdi \"%1$s\" i felt \"%2$s\" for korrelasjon \"%3$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9188,12 +9098,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9305,7 +9209,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9316,9 +9220,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9469,7 +9373,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Sett inn" @@ -9597,7 +9501,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Intervall" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9620,7 +9524,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "Ugyldig handlingstilstand: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9634,7 +9538,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9681,9 +9585,11 @@ msgstr "Ugyldige metodeparametere." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9723,17 +9629,17 @@ msgstr "Ugyldige metodeparametere." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9741,14 +9647,14 @@ msgstr "Ugyldige metodeparametere." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9756,111 +9662,116 @@ msgstr "Ugyldige metodeparametere." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10071,7 +9982,7 @@ msgstr[1] "Elementer aktivert" msgid "Item in \"not supported\" state" msgstr "Element i \"ikke støttet\" tilstand" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Varen er ikke valgt" @@ -10250,7 +10161,7 @@ msgstr "Elementer oppdatert" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10444,7 +10355,7 @@ msgstr "Etikettsted" msgid "Language" msgstr "Spr" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11046,7 +10957,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11288,7 +11199,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "Maksimal tidsperiode å vise er %1$s dag." msgstr[1] "Maksimal tidsperiode å vise er %1$s dager." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11313,7 +11224,7 @@ msgstr "Media" msgid "Media type" msgstr "Media type" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Medietype \"%1$s\" eksisterer allerede." @@ -11357,7 +11268,7 @@ msgstr "" msgid "Media type updated" msgstr "Medietype oppdatert" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "Medietype med ID \"%1$s\" er ikke tilgjengelig." @@ -11369,7 +11280,7 @@ msgstr "Medietype med ID \"%1$s\" er ikke tilgjengelig." msgid "Media types" msgstr "Medietyper" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11616,7 +11527,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12018,15 +11929,17 @@ msgstr "Nytt dashbord" msgid "New element" msgstr "Nytt element" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "Ny hendelsesvertsgruppe" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Ny hendelse merket verdi" @@ -12046,7 +11959,7 @@ msgstr "" msgid "New service time" msgstr "Ny service tid" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12073,7 +11986,7 @@ msgstr "Neste steg" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12102,30 +12015,6 @@ msgstr "Neste steg" msgid "No" msgstr "Nei" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "Ingen \"%1$s\" gitt for korrelasjon \"%2$s\"." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "Ingen \"%1$s\" gitt for korrelasjon." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12175,11 +12064,6 @@ msgstr "Ingen godkjennings brukernavn oppgitt." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "Ingen tilstandstype gitt for korrelasjon \"%1$s\"." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12318,17 +12202,46 @@ msgstr "Ingen treff funnet" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "Ingen operasjonstype gitt for korrelasjon \"%1$s\"." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Ingen tillatelser for systemtilgang." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12364,10 +12277,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12395,13 +12307,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12421,8 +12338,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12445,24 +12362,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12484,16 +12401,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12549,7 +12466,7 @@ msgstr "Ingen utløsere definert." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Ikke-boolske flagg er foreldet." @@ -12619,15 +12536,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Ikke lov til å angi passord for brukerens \"gjest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12961,15 +12878,16 @@ msgstr "Av" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Gamle hendelse tag verdi" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12991,10 +12909,6 @@ msgstr "En gang" msgid "One" msgstr "En" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "En av objektene er igjen uten vertsgruppe." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Kun en gang" @@ -13004,10 +12918,6 @@ msgstr "Kun en gang" msgid "One-time downtime" msgstr "Engangs nedetid" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Bare superadministratorer kan opprette vertsgrupper." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Kun Zabbix-agent, SNMPv1, SNMPv2 og SNMPv3-kontroller kan gjøres unike." @@ -13056,10 +12966,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Bare superadministratorer kan skape korrelasjoner." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13068,10 +12974,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Bare superadministratorer kan oppdatere korrelasjoner." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Bare utløsere som er tilordnet aktiverte verter, og avhengig av aktiverte elementer telles" @@ -13120,7 +13022,7 @@ msgstr "Operasjonen har ingen mal å betjene." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13129,33 +13031,33 @@ msgstr "" msgid "Operations" msgstr "Operasjoner" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operatør" @@ -13564,16 +13466,16 @@ msgstr "" msgid "Parameter" msgstr "Parameter" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Parameteret \"%1$s\" er utdatert." @@ -13710,7 +13612,7 @@ msgstr "" msgid "Paste without external links" msgstr "Lim inn uten eksterne lenker" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13756,7 +13658,7 @@ msgstr "Utfører en DNS-spørring. Returnerer tegnstreng med nødvendig informas #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13889,7 +13791,7 @@ msgstr "Fyller vertsinvesteringsfelt" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14209,7 +14111,7 @@ msgstr "fullmakter" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14217,7 +14119,7 @@ msgstr "fullmakter" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14227,12 +14129,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Proxy \"%1$s\" for verten \"%2$s\" eksisterer ikke." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Proxy \"%1$s\" brukes av oppdagelsesregelen \"%2$s\"." @@ -14507,7 +14409,7 @@ msgstr "" msgid "Regular expression" msgstr "Vanlig uttrykk" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14767,7 +14669,7 @@ msgid "Replace dependencies" msgstr "Erstatt avhengigheter" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14964,7 +14866,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Resultat" @@ -15205,7 +15107,7 @@ msgstr "SMTP-serverport" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15503,7 +15405,7 @@ msgstr "" msgid "Script" msgstr "Skript" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Skriptet \"%1$s\" eksisterer allerede." @@ -15617,7 +15519,7 @@ msgid "Security name" msgstr "Sikkerhetsnavn" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15832,11 +15734,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Startstart for service må være mindre enn sluttid." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15848,7 +15750,7 @@ msgstr "" msgid "Service times" msgstr "Tjenestetider" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Tjeneste type" @@ -15861,7 +15763,7 @@ msgstr "" msgid "Service updated" msgstr "Tjeneste oppdatert" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15873,7 +15775,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15891,9 +15793,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Sesjonen avsluttet, logg på igjen, vær så snill." @@ -15955,7 +15857,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16800,10 +16702,10 @@ msgstr "Tabellen \"%1$s\" har ikke et felt som heter \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Tagg" @@ -16940,7 +16842,7 @@ msgstr "Mal" msgid "Template \"%1$s\" already exists." msgstr "Mal \"%1$s\" eksisterer allerede." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17024,7 +16926,7 @@ msgstr "Mal med det samme synlige navnet \"%1$s\" eksisterer allerede." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17321,7 +17223,7 @@ msgstr "Inntil" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17728,7 +17630,7 @@ msgstr "Utløser oppdatert" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17792,9 +17694,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17804,7 +17706,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17856,7 +17758,7 @@ msgstr "Type informasjon" msgid "Types" msgstr "Typer" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17927,8 +17829,8 @@ msgstr "Nettadressen skal ha både \"navn\" og \"url\" -felt for kart \"%1$s\"." msgid "URLs" msgstr "webadresser" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18038,21 +17940,23 @@ msgstr "Enheter" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Ukjent" @@ -18070,7 +17974,7 @@ msgid "Unknown error" msgstr "Ukjent feil" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Ukjent vertsobjekt, ikke noe element i valgt vert" @@ -18209,7 +18113,7 @@ msgstr "Opp" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18343,37 +18247,37 @@ msgstr "Brukes i handlinger" msgid "User" msgstr "Bruker" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "Bruker \"%1$s\" kan ikke være uten brukergruppe." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "Bruker \"%1$s\" er dashbordet \"%2$s\" eier." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "Bruker \"%1$s\" er eier av kart \"%2$s\"." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "Bruker \"%1$s\" brukes i \"%2$s\" handling." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18395,13 +18299,13 @@ msgstr "Bruker lagt til" msgid "User agent string" msgstr "Brukeragent streng" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Brukeren kan ikke legge seg til en deaktivert gruppe eller en gruppe med deaktivert GUI-tilgang." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18425,27 +18329,27 @@ msgstr[1] "" msgid "User group" msgstr "Brukergruppe" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Brukergruppe \"%1$s\" eksisterer allerede." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "Brukergruppe \"%1$s\" brukes i \"%2$s\" handling." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Brukergruppe \"%1$s\" brukes i konfigurasjon for nedlastingsmeldinger." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Brukergruppe \"%1$s\" brukes i skriptet \"%2$s\"." @@ -18479,9 +18383,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "Brukergruppe med ID \"%1$s\" er ikke tilgjengelig." @@ -18496,7 +18400,7 @@ msgstr "Brukergruppe med ID \"%1$s\" er ikke tilgjengelig." msgid "User groups" msgstr "Brukergrupper" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Brukeren har ikke lov til å slette seg selv." @@ -18531,7 +18435,7 @@ msgstr "Bruker profil" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18550,7 +18454,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18600,12 +18504,12 @@ msgstr "Bruker oppdatert" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "Bruker med ID \"%1$s\" er ikke tilgjengelig." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18916,14 +18820,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19035,11 +18939,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Verdi av en hvilken som helst Windows-ytelsesteller. Returnerer heltall, flyt, streng eller tekst (avhengig av forespørselen)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19576,7 +19481,7 @@ msgstr "Årlig" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19633,7 +19538,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19766,11 +19670,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "en boolean verdi forventes" @@ -19778,16 +19682,16 @@ msgstr "en boolean verdi forventes" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "en tegnstreng forventes" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19796,37 +19700,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "et nummer er forventet" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "et nummer er for stort" @@ -19847,7 +19751,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19855,19 +19759,19 @@ msgstr "" msgid "a time is expected" msgstr "en tid er forventet" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "en tidsperiode er forventet" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19917,7 +19821,7 @@ msgstr "alle" msgid "all media" msgstr "alle medier" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19939,23 +19843,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "en matrise er forventet" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "en matrise eller en tegnstreng forventes" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19965,7 +19869,7 @@ msgid "an empty string is expected" msgstr "en tom streng forventes" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "et jevnt antall heksadesimale tegn forventes" @@ -19973,11 +19877,15 @@ msgstr "et jevnt antall heksadesimale tegn forventes" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20138,13 +20046,7 @@ msgstr "kan ikke endres" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20175,13 +20077,13 @@ msgstr "kan ikke endres" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20199,14 +20101,14 @@ msgstr "kan ikke endres" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20279,7 +20181,8 @@ msgid "configure" msgstr "konfigurer" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20370,7 +20273,7 @@ msgstr "synkende" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20392,13 +20295,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20424,7 +20327,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20461,7 +20365,7 @@ msgstr "uttrykket er tomt" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20552,7 +20456,7 @@ msgstr "ikon" msgid "image" msgstr "bilde" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20598,15 +20502,19 @@ msgstr "Feil elementtelling" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "feil syntaks nær \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20634,7 +20542,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "ugyldig adressesort \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "ugyldig byte-sekvens i UTF-8" @@ -20663,27 +20571,27 @@ msgstr "" msgid "invalid history storage period" msgstr "ugyldig historisk lagringsperiode" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "ugyldig regulært uttrykk" @@ -20711,7 +20619,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "er ikke vedlagt {} eller er misdannet" @@ -20861,7 +20769,7 @@ msgstr "fyrstikker" msgid "max" msgstr "maks" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20901,7 +20809,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "Minste lengde er %1$s tegn" @@ -20928,8 +20836,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20950,8 +20858,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21167,6 +21075,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21212,11 +21124,11 @@ msgstr "" msgid "regular expression" msgstr "vanlig uttrykk" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21228,15 +21140,15 @@ msgstr "" msgid "right" msgstr "Ikke sant" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21284,7 +21196,7 @@ msgstr "" msgid "short description" msgstr "Kort beskrivelse" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21303,15 +21215,15 @@ msgstr "Kort beskrivelse" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "bør være tom" @@ -21327,31 +21239,31 @@ msgstr "vis ikon mappings" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21359,15 +21271,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21380,7 +21292,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21391,7 +21303,7 @@ msgstr "" msgid "tag" msgstr "tagg" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21400,14 +21312,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "mal ID \"%1$s\" er passert %2$s ganger" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21419,20 +21331,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "parameteren \"%1$s\" mangler" @@ -21464,7 +21376,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21472,31 +21384,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21510,7 +21422,7 @@ msgstr "avtrekker" msgid "trigger does not allow manual closing" msgstr "utløser tillater ikke manuell lukking" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21522,11 +21434,11 @@ msgstr "utløser prototype kan ikke flyttes til en annen mal eller vert" msgid "trigger with linkages cannot be moved to another template or host" msgstr "Utløseren med koblinger kan ikke flyttes til en annen mal eller vert" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21535,7 +21447,7 @@ msgstr "" msgid "type here to search" msgstr "skriv her for å søke" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21583,11 +21495,12 @@ msgstr "uventet slutten av makroen" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "uventet parameter \"%1$s\"" @@ -21613,8 +21526,8 @@ msgstr "uventet tekst \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21639,6 +21552,10 @@ msgstr "" msgid "unsupported version number" msgstr "ikke-støttet versjonsnummer" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21696,61 +21613,69 @@ msgstr "verdien \"%1$s\" ble ikke funnet" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "verdien %1$s eksisterer allerede" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "verdien er for lang" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21781,15 +21706,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "verdien må være en av %1$s" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21798,7 +21721,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21811,11 +21734,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/nl/LC_MESSAGES/frontend.po b/ui/locale/nl/LC_MESSAGES/frontend.po index 037df2cabfa..b320305eef1 100644 --- a/ui/locale/nl/LC_MESSAGES/frontend.po +++ b/ui/locale/nl/LC_MESSAGES/frontend.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Zabbix 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2013-08-07 16:41+0300\n" "Last-Translator: open-future <patrik@open-future.be>\n" "Language-Team: NL\n" @@ -502,7 +502,7 @@ msgstr "Bevestigen" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Bevestigd" @@ -601,7 +601,7 @@ msgstr "Actie \"%1$s\" bestaat reeds." msgid "Action \"%1$s\" no operations defined." msgstr "Actie \"%1$s\" geen bewerking gedefinieerd." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -727,7 +727,7 @@ msgstr "Actief tot" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -738,7 +738,7 @@ msgstr "Actief tot" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -994,7 +994,7 @@ msgstr "Leeftijd minder dan" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1316,7 +1316,7 @@ msgstr "Op (hour:minute)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1325,8 +1325,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1337,6 +1337,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1348,7 +1353,7 @@ msgstr "Op zijn minst een onderhoudsperiode moet aangemaakt zijn." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1434,7 +1439,7 @@ msgstr "Authenticatie" msgid "Authentication algorithm" msgstr "Authenticatie algoritme" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1483,7 +1488,7 @@ msgstr "" msgid "Auto-login" msgstr "Auto-login" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1494,7 +1499,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1753,7 +1758,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1788,7 +1793,7 @@ msgstr "Terugbellen" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1994,7 +1999,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2116,7 +2121,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Kan de Zabbix gebruiker \"%1$s\" niet verwijderen, probeer de gebruiker uit te schakelen." @@ -2125,7 +2130,7 @@ msgstr "Kan de Zabbix gebruiker \"%1$s\" niet verwijderen, probeer de gebruiker msgid "Cannot delete action" msgstr "Kan actie niet verwijderen" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2192,7 +2197,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2263,7 +2268,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "Kan proxy niet verwijderen" msgstr[1] "Kan proxy niet verwijderen" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2286,7 +2291,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "Kan script niet verwijderen" msgstr[1] "Kan script niet verwijderen" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Kan de scripts niet verwijderen. Het script \"%1$s\" wordt gebruikt in een handeling voor actie \"%2$s\"." @@ -2680,16 +2685,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "Weergavenaam van sjabloon mag niet leeg zijn." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2702,7 +2707,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "Kan sjabloon niet importeren \"%1$s\", gekoppeld sjabloon \"%2$s\" bestaat niet." msgstr[1] "Kan sjabloon niet importeren \"%1$s\", gekoppelde sjablonen \"%2$s\" bestaan niet." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Kan trigger-expressie niet invoegen" @@ -2723,7 +2728,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2785,7 +2790,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Kan het antwoord niet lezen. Controleer de verbinding met Zabbix server \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Kan de gastgebruiker niet hernoemen." @@ -2868,7 +2873,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Kan Web scenarios niet ontkoppelen en opschonen." @@ -2881,7 +2886,7 @@ msgstr "Kan template niet ontkoppelen" msgid "Cannot unlink template." msgstr "Kan sjabloon niet ontkoppelen." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2943,9 +2948,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Kan een ontdekte grafiek niet bijwerken." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Kan een ontdekte hostgroep niet bijwerken." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3004,9 +3010,7 @@ msgstr "Kan grafiek-prototype niet bijwerken" msgid "Cannot update group" msgstr "Kan groep niet bijwerken" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Kan geen groepen updaten voor ontdekte host \"%1$s\"." @@ -3091,12 +3095,12 @@ msgstr "Kan netwerk kaart niet bijwerken" msgid "Cannot update proxy" msgstr "Kan proxy niet bijwerken" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Kan proxy niet bijwerken voor ontdekte host \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3116,9 +3120,9 @@ msgstr "" msgid "Cannot update script" msgstr "Kan script niet bijwerken" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3302,8 +3306,8 @@ msgid "Character string not included" msgstr "Chassis info - geeft standaard de volledige informatie" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3479,7 +3483,7 @@ msgstr "Klok" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3517,13 +3521,13 @@ msgstr "Sluiten" msgid "Close expression constructor" msgstr "Sluit expressie bouwer" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3620,7 +3624,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3631,11 +3635,6 @@ msgstr "Condities" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3651,11 +3650,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3847,7 +3841,7 @@ msgstr "Bevestigingstekst" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4049,12 +4043,11 @@ msgstr "Kopie" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4081,16 +4074,6 @@ msgid_plural "Correlations enabled" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4101,8 +4084,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Telling" @@ -4474,7 +4457,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS naam" @@ -4749,8 +4732,8 @@ msgstr "Dec" msgid "December" msgstr "December" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4760,7 +4743,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4857,7 +4840,7 @@ msgstr "Vertraagd door" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4907,7 +4890,7 @@ msgstr "Sjabloon verwijderen en opschonen? (Aandacht: alle gelinkte host worden msgid "Delete current action?" msgstr "Huidige actie verwijderen?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5205,7 +5188,7 @@ msgstr "" msgid "Dependencies" msgstr "Afhankelijkheden" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Afhankelijk" @@ -5213,7 +5196,7 @@ msgstr "Afhankelijk" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5422,10 +5405,10 @@ msgstr "Geselecteerde webdraaiboeken uitschakelen?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5508,7 +5491,7 @@ msgid "Discovery by proxy" msgstr "Ontdekt door proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Ontdekking controle" @@ -5520,7 +5503,7 @@ msgstr "Ontdekking controles" msgid "Discovery list" msgstr "Ontdekking lijst" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Ontdekking object" @@ -5620,7 +5603,7 @@ msgstr "Ontdekkingsregel aangepast" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5631,7 +5614,7 @@ msgstr "Ontdekkingsregels" msgid "Discovery rules deleted" msgstr "Ontdekkingsregels verwijderd" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Ontdekking status" @@ -5787,18 +5770,6 @@ msgstr "" msgid "Draw style" msgstr "Afbeelding stijl" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5811,11 +5782,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5975,10 +5941,6 @@ msgstr "SSL-sleutelbestand voor webdraaiboek \"%1$s\" is leeg." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6005,11 +5967,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6194,7 +6154,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6205,7 +6165,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6248,7 +6208,7 @@ msgid "English (en_US)" msgstr "Engels (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6323,7 +6283,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6358,11 +6318,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Soort evenement" @@ -6698,7 +6658,6 @@ msgstr "Veld \"%1$s\" kan niet worden ingesteld op NULL." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7066,7 +7025,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Gegeven uitdrukking is geen macro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7311,12 +7270,12 @@ msgstr "Raster" msgid "Group" msgstr "Groep" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Groep \"%1$s\" kan niet worden verwijderd omdat het wordt gebruikt door een host-prototype." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7648,7 +7607,7 @@ msgstr[1] "Hosts" msgid "Host \"%1$s\" already exists." msgstr "Host \"%1$s\" bestaat reeds." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7656,7 +7615,7 @@ msgstr "Host \"%1$s\" bestaat reeds." msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7727,17 +7686,17 @@ msgstr[1] "Hosts ingeschakeld" msgid "Host group" msgstr "Hostgroep" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Host groep \"%1$s\" bestaat al." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script.Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script.Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script.Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7751,9 +7710,9 @@ msgid "Host group label type" msgstr "Hostgroep typeplaatje" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7769,8 +7728,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7958,7 +7917,7 @@ msgstr "Host met de weergavenaam \"%1$s\" bestaat al." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8046,7 +8005,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP adres" @@ -8071,7 +8030,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8128,12 +8087,12 @@ msgstr "icoon markeren" msgid "Icon map" msgstr "icoon map" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\".icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\".icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\".icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\"." @@ -8157,7 +8116,7 @@ msgstr "Icoon map bijgewerkt" msgid "Icon mapping" msgstr "Icoon toewijzing" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8388,7 +8347,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8401,11 +8360,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8617,24 +8576,6 @@ msgstr "Verkeerde actie bediening gebruikersgroep. Gebruikersgroep bestaat niet msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Verkeerde actie bediening gebruiker. Gebruiker bestaat niet of u heeft geen toegang tot deze gebruiker." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8719,20 +8660,11 @@ msgstr "Onjuiste condities voor actie \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8797,11 +8729,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8909,7 +8836,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -9023,11 +8950,6 @@ msgstr "Onjuiste trigger-prototypeexpressie. Trigger-prototypeexpressies kunnen msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9049,10 +8971,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9114,18 +9036,6 @@ msgstr "Onjuiste waarde \"%1$s\" voor int veld \"%2$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Onjuiste waarde \"%1$s\" voor unsigned int veld \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9187,12 +9097,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9304,7 +9208,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9315,9 +9219,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9468,7 +9372,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Invoegen" @@ -9596,7 +9500,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Interval" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9619,7 +9523,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9633,7 +9537,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9680,9 +9584,11 @@ msgstr "Ongeldige werkwijze parameters." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9722,17 +9628,17 @@ msgstr "Ongeldige werkwijze parameters." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9740,14 +9646,14 @@ msgstr "Ongeldige werkwijze parameters." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9755,111 +9661,116 @@ msgstr "Ongeldige werkwijze parameters." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10070,7 +9981,7 @@ msgstr[1] "Items ingeschakeld" msgid "Item in \"not supported\" state" msgstr "Item in \"niet ondersteund\" toestand" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Item niet geselecteerd" @@ -10250,7 +10161,7 @@ msgstr "Bijgewerkte artikelen" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10443,7 +10354,7 @@ msgstr "Label locatie" msgid "Language" msgstr "Taal" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11044,7 +10955,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11286,7 +11197,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11311,7 +11222,7 @@ msgstr "Media" msgid "Media type" msgstr "Media type" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11355,7 +11266,7 @@ msgstr "" msgid "Media type updated" msgstr "Media type bijgewerkt" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11367,7 +11278,7 @@ msgstr "" msgid "Media types" msgstr "Media types" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11614,7 +11525,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12016,15 +11927,17 @@ msgstr "" msgid "New element" msgstr "Nieuw element" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12044,7 +11957,7 @@ msgstr "" msgid "New service time" msgstr "" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12071,7 +11984,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12100,30 +12013,6 @@ msgstr "" msgid "No" msgstr "Nee" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12173,11 +12062,6 @@ msgstr "" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12316,17 +12200,46 @@ msgstr "Geen overeenkomsten gevonden." msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12362,10 +12275,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12393,13 +12305,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12419,8 +12336,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12443,24 +12360,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12482,16 +12399,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12547,7 +12464,7 @@ msgstr "" msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12617,15 +12534,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Niet toegestaan om het wachtwoord van user \"guest\" in te stellen." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12959,15 +12876,16 @@ msgstr "UIT" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12989,10 +12907,6 @@ msgstr "" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "" @@ -13002,10 +12916,6 @@ msgstr "" msgid "One-time downtime" msgstr "Eenmalige onderbreking" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Alleen hoofdbeheerders kunnen hostgroepen aanmaken." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -13054,10 +12964,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13066,10 +12972,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Alleen triggers gekoppeld aan ingeschakelde hosts en afhankelijk van ingeschakelde items worden meegeteld." @@ -13118,7 +13020,7 @@ msgstr "" msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13127,33 +13029,33 @@ msgstr "" msgid "Operations" msgstr "" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "" @@ -13562,16 +13464,16 @@ msgstr "" msgid "Parameter" msgstr "Parameter" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13708,7 +13610,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13754,7 +13656,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13887,7 +13789,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14207,7 +14109,7 @@ msgstr "" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14215,7 +14117,7 @@ msgstr "" msgid "Proxy" msgstr "" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14225,12 +14127,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "" -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "" @@ -14505,7 +14407,7 @@ msgstr "" msgid "Regular expression" msgstr "" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14765,7 +14667,7 @@ msgid "Replace dependencies" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14962,7 +14864,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "" @@ -15203,7 +15105,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15501,7 +15403,7 @@ msgstr "" msgid "Script" msgstr "Script" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15615,7 +15517,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15830,11 +15732,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "" -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15846,7 +15748,7 @@ msgstr "" msgid "Service times" msgstr "" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "" @@ -15859,7 +15761,7 @@ msgstr "" msgid "Service updated" msgstr "Service bijgewerkt" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15871,7 +15773,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15889,9 +15791,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "" @@ -15953,7 +15855,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16798,10 +16700,10 @@ msgstr "" #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Etiket" @@ -16938,7 +16840,7 @@ msgstr "Template" msgid "Template \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17022,7 +16924,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17319,7 +17221,7 @@ msgstr "Tot" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17726,7 +17628,7 @@ msgstr "trigger bijgewerkt" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17790,9 +17692,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17802,7 +17704,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17854,7 +17756,7 @@ msgstr "Type informatie" msgid "Types" msgstr "Types" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17925,8 +17827,8 @@ msgstr "" msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18036,21 +17938,23 @@ msgstr "Eenheden" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Onbekend" @@ -18068,7 +17972,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Onbekend host item, het item bestaat niet voor de geselecteerde host" @@ -18207,7 +18111,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18341,37 +18245,37 @@ msgstr "Gebruikt in acties" msgid "User" msgstr "Gebruiker" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18393,13 +18297,13 @@ msgstr "Gebruikers toegevoegd" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "" #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18423,27 +18327,27 @@ msgstr[1] "" msgid "User group" msgstr "Gebruikers groep" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Gebruikers groep \"%1$s\" wordt gebruikt in script \"%2$s\"." @@ -18477,9 +18381,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18494,7 +18398,7 @@ msgstr "" msgid "User groups" msgstr "Gebruikers groepen" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Gebruiker mag zichzelf niet verwijderen" @@ -18529,7 +18433,7 @@ msgstr "Gebruikersprofiel" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18548,7 +18452,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18598,12 +18502,12 @@ msgstr "Gebruiker bijgewerkt" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18914,14 +18818,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19033,11 +18937,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19574,7 +19479,7 @@ msgstr "Jaarlijks" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19631,7 +19536,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19764,11 +19668,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19776,16 +19680,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19794,37 +19698,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19845,7 +19749,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19853,19 +19757,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19915,7 +19819,7 @@ msgstr "alle" msgid "all media" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19937,23 +19841,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19963,7 +19867,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19971,11 +19875,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20136,13 +20044,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20173,13 +20075,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20197,14 +20099,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20277,7 +20179,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20368,7 +20271,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20390,13 +20293,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20422,7 +20325,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20459,7 +20363,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20550,7 +20454,7 @@ msgstr "icoon" msgid "image" msgstr "afbeelding" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20595,15 +20499,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20631,7 +20539,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20660,27 +20568,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20708,7 +20616,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20858,7 +20766,7 @@ msgstr "" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20898,7 +20806,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20925,8 +20833,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20947,8 +20855,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21164,6 +21072,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21209,11 +21121,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21225,15 +21137,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21281,7 +21193,7 @@ msgstr "" msgid "short description" msgstr "korte beschrijving" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21300,15 +21212,15 @@ msgstr "korte beschrijving" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21324,31 +21236,31 @@ msgstr "Laat icon mappings zien" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21356,15 +21268,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21377,7 +21289,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21388,7 +21300,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21397,14 +21309,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "template ID \"%1$s\" is %2$s keer verwerkt" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21416,20 +21328,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21461,7 +21373,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21469,31 +21381,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21507,7 +21419,7 @@ msgstr "trigger" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21519,11 +21431,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21532,7 +21444,7 @@ msgstr "" msgid "type here to search" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21580,11 +21492,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21610,8 +21523,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21636,6 +21549,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21693,61 +21610,69 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21778,15 +21703,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21795,7 +21718,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21808,11 +21731,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/pl/LC_MESSAGES/frontend.po b/ui/locale/pl/LC_MESSAGES/frontend.po index 10af3f230e4..63734384ead 100644 --- a/ui/locale/pl/LC_MESSAGES/frontend.po +++ b/ui/locale/pl/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2014-06-04 11:22+0300\n" "Last-Translator: Paweł <pawel.seledec@zetosoftware.pl>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -521,7 +521,7 @@ msgstr "Potwierdzenie" msgid "Acknowledge problems" msgstr "Potwierdź problemy" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Potwierdzone" @@ -620,7 +620,7 @@ msgstr "Akcja \"%1$s\" już istnieje." msgid "Action \"%1$s\" no operations defined." msgstr "Akcja \"%1$s\" nie ma zdefiniowanych operacji." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -748,7 +748,7 @@ msgstr "Aktywne do" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -759,7 +759,7 @@ msgstr "Aktywne do" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -1015,7 +1015,7 @@ msgstr "Wiek mniej niż" msgid "Age less than %1$s" msgstr "Wiek mniejszy niż %1$s" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1337,7 +1337,7 @@ msgstr "O (godzina:minuta)" msgid "At least one UI element must be checked." msgstr "Przynajmniej jeden element UI musi być sprawdzony." -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1346,8 +1346,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "Przynajmniej jedna akcja jest wymagana." -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "Przynajmniej jeden aktywny użytkownik musi posiadać role \"%1$s\"." @@ -1358,6 +1358,11 @@ msgstr "Przynajmniej jeden aktywny użytkownik musi posiadać role \"%1$s\"." msgid "At least one host group or host must be selected." msgstr "Przynajmniej jedna grupa hosta lub host muszą być wybrane." +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1369,7 +1374,7 @@ msgstr "Przynajmniej jeden okres utrzymania musi być utworzony." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "Przynajmniej jedna baza MySQL, PostgreSQL lub Oracle powinna być wspierana." -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "Przynajmniej jedna operacja musi być wybrana." @@ -1455,7 +1460,7 @@ msgstr "Uwierzytelnianie" msgid "Authentication algorithm" msgstr "Algorytm uwierzytelniania" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "Uwierzytelnienie nieudane: %1$s." @@ -1504,7 +1509,7 @@ msgstr "Auto" msgid "Auto-login" msgstr "Automatyczne logowanie" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Opcje automatycznego logowania i wylogowania nie mogą być razem włączone." @@ -1515,7 +1520,7 @@ msgstr "Automatyczne wylogowanie" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1774,7 +1779,7 @@ msgstr "CRLF" msgid "CSV to JSON" msgstr "CSV do JSON" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1809,7 +1814,7 @@ msgstr "Oddzwanianie" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -2016,7 +2021,7 @@ msgstr "Nie można dołączyć do serwera LDAP." msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2142,7 +2147,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Nie można usunąć wewnętrznego użytkownika Zabbix \"%1$s\", proszę spróbować wyłączyć tego użytkownika." @@ -2151,7 +2156,7 @@ msgstr "Nie można usunąć wewnętrznego użytkownika Zabbix \"%1$s\", proszę msgid "Cannot delete action" msgstr "Nie można usunąć akcji" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2222,7 +2227,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2297,7 +2302,7 @@ msgstr[0] "Nie można usunąć proxy" msgstr[1] "Nie można usunąć proxy" msgstr[2] "Nie można usunąć proxy" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "Nie można usunąć roli użytkownika, jest ona tylko do odczytu \"%1$s\"." @@ -2323,7 +2328,7 @@ msgstr[0] "Nie można usunąć skryptu" msgstr[1] "Nie można usunąć skryptu" msgstr[2] "Nie można usunąć skryptu" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Nie można usunąć skryptu. Skrypt \"%1$s\" jest wykoprzystywany w akcji \"%2$s\"." @@ -2743,16 +2748,16 @@ msgstr "Nie można znaleźć mapy wartości \"%1$s\" użytej dla prototypu pozyc msgid "Cannot have empty visible template name." msgstr "Widoczna nazwa szablonu nie może być pusta." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2766,7 +2771,7 @@ msgstr[0] "Nie można zaimportować szablonu \"%1$s\", nie istnieje podłączony msgstr[1] "Nie można zaimportować szablonu \"%1$s\", nie istnieją podłączone szablony \"%2$s\"." msgstr[2] "Nie można zaimportować szablonu \"%1$s\", nie istnieją podłączone szablony \"%2$s\"." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Nie można dodać wyrażenia wyzwalacza" @@ -2788,7 +2793,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2850,7 +2855,7 @@ msgstr "Nie można odczytać YAML: %1$s." msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Nie można odczytać odpowiedzi, sprawdź połączenie z serwerem Zabbix'a \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Nie można zmienić nazwy użytkownikowi - gościowi." @@ -2934,7 +2939,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Nie można odłączyć i wyczyścić Scenariuszy sieci www." @@ -2947,7 +2952,7 @@ msgstr "Nie można odłączyć szablonu" msgid "Cannot unlink template." msgstr "Nie można odłączyć szablonu." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "Nie można odlinkować wyzwalacza \"%1$s\", posiada on elementy z szablonu, który pozostaje podlinkowany do hosta" @@ -3009,9 +3014,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Nie można zaktualizować wykrytego wykresu." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Nie można zaktualizować grupy wykrytych hostów." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3071,9 +3077,7 @@ msgstr "Nie można zaktualizować prototypu wykresu" msgid "Cannot update group" msgstr "Nie można zaktualizować grupy" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Nie można zaktualizować grup dla wykrytego hosta \"%1$s\"." @@ -3158,12 +3162,12 @@ msgstr "Nie można zaktualizować mapy sieci" msgid "Cannot update proxy" msgstr "Nie można zaktualizować proxy" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Nie można zaktualizować proxy na wykrytym hoście \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "Nie można zaktualizować roli użytkownika jest ona tylko do odczytu \"%1$s\"." @@ -3183,9 +3187,9 @@ msgstr "" msgid "Cannot update script" msgstr "Nie można zaktualizować skryptu" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3370,8 +3374,8 @@ msgid "Character string not included" msgstr "Nie zawiera podanego ciągu znaków" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3547,7 +3551,7 @@ msgstr "Zegar" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3585,13 +3589,13 @@ msgstr "Zamknij" msgid "Close expression constructor" msgstr "Zamknij generator wyrażeń" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Zamknij nowe zdarzenie" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Zamknij stare zdarzenia" @@ -3688,7 +3692,7 @@ msgstr "Kompresja" msgid "Concurrent sessions" msgstr "Sesje bieżące" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3699,11 +3703,6 @@ msgstr "Warunek" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "Warunek \"%2$s\" nie został użyty w formule \"%3$s\" dla akcji \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "Warunek\"%2$s\" nie został użyty w formule \"%3$s\" dla współzależności \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3719,11 +3718,6 @@ msgstr "Warunnek \"%2$s\" nie jest użyty w formule \"%3$s\" dla nadpisania \"%1 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "Warunek \"%2$s\" użyty w formule \"%3$s\" dla akcji \"%1$s\" nie został zdefiniowany." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "Warunek\"%2$s\" użyty we wzorcu \"%3$s\" dla współzależności \"%1$s\" nie jest zdefiniowany." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3915,7 +3909,7 @@ msgstr "Tekst potwierdzenia" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Gratulacje! Poprawnie zainstalowano interfejs użytkownika Zabbix." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4128,12 +4122,11 @@ msgstr "Skopiuj" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Współzależność" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "Współzależność \"%1$s\" już istnieje." @@ -4163,16 +4156,6 @@ msgstr[0] "Współzależność włączona" msgstr[1] "Współzależności włączone" msgstr[2] "Współzależności włączonych" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "We współzależności brakuje parametrów: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "Nazwa współzależności nie może być pusta." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Reguła współzależności" @@ -4183,8 +4166,8 @@ msgstr "Współzależność zaktualizowana" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Ilość" @@ -4556,7 +4539,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "Nazwa DNS" @@ -4832,8 +4815,8 @@ msgstr "Gru" msgid "December" msgstr "Grudzień" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4843,7 +4826,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4940,7 +4923,7 @@ msgstr "Opóźniony o" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4990,7 +4973,7 @@ msgstr "Usunąć i wyczyścić szablon? (Uwaga: wszystkie powiązane hosty zosta msgid "Delete current action?" msgstr "Usunąć aktualną akcję?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Usunąć bieżącą współzależność?" @@ -5288,7 +5271,7 @@ msgstr "Lista zabroniona" msgid "Dependencies" msgstr "Zależności" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Zależny" @@ -5296,7 +5279,7 @@ msgstr "Zależny" msgid "Dependent item" msgstr "Element zależny" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5505,10 +5488,10 @@ msgstr "Wyłączyć wybrane scenariusze sieci www?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5591,7 +5574,7 @@ msgid "Discovery by proxy" msgstr "Wykrywanie przez proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Test wykrywania" @@ -5603,7 +5586,7 @@ msgstr "Testy wykrywania" msgid "Discovery list" msgstr "Lista reguł wykrywania" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Obiekt wykrywania" @@ -5705,7 +5688,7 @@ msgstr "Zaktualizowano regułę wykrywania" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5716,7 +5699,7 @@ msgstr "Reguły wykrywania" msgid "Discovery rules deleted" msgstr "Usunięto reguły wykrywania" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Stan wykrywania" @@ -5872,18 +5855,6 @@ msgstr "Rysuj" msgid "Draw style" msgstr "Styl rysowania" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "Powtórzenie \"%1$s\" wartości \"%2$s\" dla współzależności \"%3$s\"." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Powtórzenie \"%1$s\" wartości \"%2$s\" dla współzależności." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5896,11 +5867,6 @@ msgstr "Powtórzona wartość \"name\" (nazwa) \"%1$s\" dla mapy." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -6060,10 +6026,6 @@ msgstr "Plik klucza SSL dla scenariusza sieci www \"%1$s\" jest pusty." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "Puste ID współzależności." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6090,11 +6052,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "Typ warunku filtra dla akcji \"%1$s\" jest pusty." #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6279,7 +6239,7 @@ msgstr "Włącz wyłapywanie" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6290,7 +6250,7 @@ msgstr "Włącz wyłapywanie" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6333,7 +6293,7 @@ msgid "English (en_US)" msgstr "Angielski (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6408,7 +6368,7 @@ msgid "Event correlation" msgstr "Współzależność zdarzeń" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Zasady współzależności zdarzeń" @@ -6443,11 +6403,11 @@ msgstr "Monitorowanie logu zdarzeń. Zwraca log" msgid "Event name" msgstr "Nazwa zdarzenia" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Para znaczników zdarzeń" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Typ zdarzenia" @@ -6784,7 +6744,6 @@ msgstr "Pole \"%1$s\" nie może być ustawione na NULL." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7152,7 +7111,7 @@ msgstr "Pobiera wartość z hosta" msgid "Given expression is not a macro" msgstr "Podane wyrażenie nie jest makrem" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "Globalne wyrażenia regularne \"%1$s\" nie istnieją." @@ -7398,12 +7357,12 @@ msgstr "Siatka" msgid "Group" msgstr "Grupa" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Nie można usunąć grupy \"%1$s\", jest używana przez prototyp hosta." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "Grupa\"%1$s\" nie może zostać usunięta, ponieważ jest użyta w warunku współzależności." @@ -7737,7 +7696,7 @@ msgstr[2] "Hosty" msgid "Host \"%1$s\" already exists." msgstr "Host \"%1$s\" już istnieje." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7745,7 +7704,7 @@ msgstr "Host \"%1$s\" już istnieje." msgid "Host \"%1$s\" cannot be without host group." msgstr "Host \"%1$s\" nie może istnieć bez grupy hostów." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7818,17 +7777,17 @@ msgstr[2] "Włączono hosty" msgid "Host group" msgstr "Grupa hostów" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Grupa hostów \"%1$s\" już istnieje." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Nie można usunąć grupy hostów \"%1$s\", jest użyta w skrypcie globalnym." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7842,9 +7801,9 @@ msgid "Host group label type" msgstr "Typ etykiety grupy hostów" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "Grupa hosta o ID \"%1$s\" jest niedostępna." @@ -7860,8 +7819,8 @@ msgstr "Grupa hosta o ID \"%1$s\" jest niedostępna." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -8049,7 +8008,7 @@ msgstr "Host o takiej samej widocznej nazwie \"%1$s\" już istnieje." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8137,7 +8096,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "Adres IP" @@ -8162,7 +8121,7 @@ msgstr "Zakres IP \"%1$s\" osiągnął limit adresowy \"%2$s\"" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8219,12 +8178,12 @@ msgstr "Podświetlenie ikony" msgid "Icon map" msgstr "Mapa ikon" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "Mapa ikon \"%1$s\" już istnieje." -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Mapa ikon \"%1$s\" nie może być usunięta. Jest użyta w mapie \"%2$s\"." @@ -8248,7 +8207,7 @@ msgstr "Zaktualizowano mapę ikon" msgid "Icon mapping" msgstr "Mapowanie ikon" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "Ikona o ID \"%1$s\" jest niedostępna." @@ -8481,7 +8440,7 @@ msgstr "Nieosiągalny prototyp elementu" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8494,11 +8453,11 @@ msgstr "Nieosiągalna mapa" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "Nieosiągalny szablon" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "Nieosiągalny wyzwalacz" @@ -8710,24 +8669,6 @@ msgstr "Błędna grupa użytkowników dla operacji akcji. Grupa użytkowników n msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Błędny użytkownik dla operacji akcji. Użytkownik nie istnieje lub brak praw dostępu do niego." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8812,20 +8753,11 @@ msgstr "Błędne warunki dla akcji \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Błędne warunki dla reguły wykrywania \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "Nieprawidłowe ID współzależności." - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "Błędne wyrażenie użytkownika \"%2$s\" dla akcji \"%1$s\": %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "Nieprawidłowe własne wyrażenie \"%2$s\" dla współzależności \"%1$s\": %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8890,11 +8822,6 @@ msgstr "Błędne ID formuły warunku filtra dla akcji \"%1$s\"." msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Błędne ID formuły warunku filtra dla reguły wykrywania \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "Podano błędne ID formuły warunku filtra dla współzależności \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -9002,7 +8929,7 @@ msgstr "Błędne ID mapy." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Błędna metoda \"%1$s.%2$s\"." @@ -9116,11 +9043,6 @@ msgstr "Błędne wyrażenie prototypu wyzwalacza. Elementy wyrażenia prototypu msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Błędny typ obliczenia dla akcji \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "Nieprawidłowy typ wyliczenia dla współzależności \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9142,10 +9064,10 @@ msgstr "Błędne ID użytkownika określone dla mapy \"%1$s\"." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "Błędne ID grupy użytkowników określone dla mapy \"%1$s\"." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "Błędna nazwa użytkownika lub hasło albo konto jest tymczasowo zablokowane." @@ -9207,18 +9129,6 @@ msgstr "Błędna wartość \"%1$s\" dla pola całkowitego \"%2$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Błędna wartość \"%1$s\" dla pola całkowitego bez znaku \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "Nieprawidłowa wartość \"%1$s\" w polu \"%2$s\" dla współzależności \"%3$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9280,12 +9190,6 @@ msgstr "Błędna wartość dla pola \"%1$s\"." #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9397,7 +9301,7 @@ msgstr "Błędna wartość dla pola \"%1$s\"." #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9408,9 +9312,9 @@ msgstr "Błędna wartość dla pola \"%1$s\"." #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9561,7 +9465,7 @@ msgstr "Znaczniki dziedziczone i wyzwalacz" msgid "Inherited items" msgstr "Dziedziczone elementy" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Wprowadź" @@ -9689,7 +9593,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Interwał" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9712,7 +9616,7 @@ msgstr "Nieprawidłowa treść pliku YAML" msgid "Invalid action condition: %1$s." msgstr "Nieprawidłowy warunek akcji: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9726,7 +9630,7 @@ msgstr "Nieprawidłowa data." msgid "Invalid email address \"%1$s\"." msgstr "Nieprawidłowy adres email \"%1$s\"." -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "Nieprawidłowy adres email dla rodzaju medium o ID \"%1$s\"." @@ -9773,9 +9677,11 @@ msgstr "Nieprawidłowe parametry metody." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9815,17 +9721,17 @@ msgstr "Nieprawidłowe parametry metody." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9833,14 +9739,14 @@ msgstr "Nieprawidłowe parametry metody." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9848,111 +9754,116 @@ msgstr "Nieprawidłowe parametry metody." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10166,7 +10077,7 @@ msgstr[2] "Włączono pozycje" msgid "Item in \"not supported\" state" msgstr "Pozycja w stanie \"niewspierany\"." -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Nie wybrano pozycji" @@ -10346,7 +10257,7 @@ msgstr "Zaktualizowano pozycje" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10539,7 +10450,7 @@ msgstr "Położenie etykiety" msgid "Language" msgstr "Język" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "Język \"%1$s\" nie jest wspierany." @@ -11146,7 +11057,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11389,7 +11300,7 @@ msgstr[0] "Maksymalny okres do wyświetlenia to %1$s dzień." msgstr[1] "Maksymalny okres do wyświetlenia to %1$s dni." msgstr[2] "Maksymalny okres do wyświetlenia to %1$s dni." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "Maksymalna całkowita długość adresu email osiągnięta dla typu mediów o ID \"%1$s\"." @@ -11414,7 +11325,7 @@ msgstr "Media" msgid "Media type" msgstr "Typ mediów" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Typ mediów \"%1$s\" już istnieje." @@ -11461,7 +11372,7 @@ msgstr "Udany test typu mediów." msgid "Media type updated" msgstr "Zaktualizowano typ mediów" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "Typ mediów o ID \"%1$s\" jest niedostępny." @@ -11473,7 +11384,7 @@ msgstr "Typ mediów o ID \"%1$s\" jest niedostępny." msgid "Media types" msgstr "Typy mediów" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "Typy mediów używane przez akcje \"%1$s\"." @@ -11725,7 +11636,7 @@ msgstr[2] "Wyłączonych modułów: %1$s." msgid "Module updated: %1$s." msgstr "Zaktualizowany moduł: %1$s." -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12127,15 +12038,17 @@ msgstr "Nowy panel" msgid "New element" msgstr "Nowy element" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "Nowa grupa hostów zdarzenia" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "Nowa nazwa znacznika zdarzenia" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Nowa wartość znacznika zdarzenia" @@ -12155,7 +12068,7 @@ msgstr "" msgid "New service time" msgstr "Nowy czas obsługi" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "Nowa nazwa znacznika" @@ -12182,7 +12095,7 @@ msgstr "Następny krok" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12211,30 +12124,6 @@ msgstr "Następny krok" msgid "No" msgstr "Nie" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "Nie podano \"%1$s\" dla współzależności \"%2$s\"." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "Nie podano \"%1$s\" dla współzależności." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12284,11 +12173,6 @@ msgstr "Nie określono nazwy użytkownika do uwierzytelniania." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "Nie podano typu warunku dla współzależności \"%1$s\"." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12427,17 +12311,46 @@ msgstr "Nie znaleziono" msgid "No new modules discovered" msgstr "Brak wykrytych nowych modułów" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "Nie podano typu operacji dla współzależności \"%1$s\"." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Brak uprawnień dla dostępu do systemu." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"." @@ -12473,10 +12386,9 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"." #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12504,13 +12416,18 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"." #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12530,8 +12447,8 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"." #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12554,24 +12471,24 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"." #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12593,16 +12510,16 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"." #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12658,7 +12575,7 @@ msgstr "Nie zdefiniowano żadnych wyzwalaczy." msgid "No value" msgstr "Brak wartości" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Flagi nieboolowskie są przestarzałe." @@ -12728,15 +12645,15 @@ msgstr "Nie wszystkie wyniki są wyświetlanie. Proszę dostarczyć ściślej ok msgid "Not all templates are linked to \"%1$s\"." msgstr "Nie wszystkie szablony są podłączone\"%1$s\"." -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "Nie zezwolono ustawienia języka dla użytkownika \"guest\"." -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Nie można ustawić hasła dla użytkownika \"guest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "Nie zezwolno ustawienia motywu dla użytkownika \"guest\"." @@ -13070,15 +12987,16 @@ msgstr "Wyłączone" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "Stare zdarzenia znacznika nazwy" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Stara wartość znacznika zdarzenia" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "Stary znacznik nazwy" @@ -13100,10 +13018,6 @@ msgstr "Raz" msgid "One" msgstr "Jeden" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Jeden z obiektów nadal nie ma grupy hostów." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Jednorazowo" @@ -13113,10 +13027,6 @@ msgstr "Jednorazowo" msgid "One-time downtime" msgstr "Jednorazowa przerwa w pracy" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Tylko Super Administratorzy mogą tworzyć grupy hostów." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Tylko kontrole agenta Zabbix, SNMPv1, SNMPv2 i SNMPv3 mogą być unikalne." @@ -13166,10 +13076,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Tylko super administratorzy mogą tworzyć współzależności." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "Tylko super administratorzy mogą ustawić właściciela panelu." @@ -13178,10 +13084,6 @@ msgstr "Tylko super administratorzy mogą ustawić właściciela panelu." msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Tylko super administratorzy mogą aktualizować współzależności." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Liczone są tylko wyzwalacze przypisane do włączonych hostów w zależności od włączonych pozycji" @@ -13230,7 +13132,7 @@ msgstr "Operacja nie ma szablonu, na którym może działać." msgid "Operational data" msgstr "Dane operacyjne" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13239,33 +13141,33 @@ msgstr "Dane operacyjne" msgid "Operations" msgstr "Operacje" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operator" @@ -13674,16 +13576,16 @@ msgstr "Pager" msgid "Parameter" msgstr "Parametr" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Parametr \"%1$s\" jest przestarzały." @@ -13820,7 +13722,7 @@ msgstr "Wklej widżet" msgid "Paste without external links" msgstr "Wklej bez zewnętrznych łączy" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "Wzór" @@ -13866,7 +13768,7 @@ msgstr "Wykonuje zapytanie DNS. Zwraca ciąg znaków z wymaganym typem informacj #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13999,7 +13901,7 @@ msgstr "Powielaj pola inwentarza hosta" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14319,7 +14221,7 @@ msgstr "Serwery proxy" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14327,7 +14229,7 @@ msgstr "Serwery proxy" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "Proxy \"%1$s\" już istnieje." @@ -14337,12 +14239,12 @@ msgstr "Proxy \"%1$s\" już istnieje." msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Nie istnieje proxy \"%1$s\" dla hosta \"%2$s\"." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "Proxy \"%1$s\" jest używane przez akcje \"%2$s\"." -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Proxy \"%1$s\" jest używane przez regułę wyszukiwania \"%2$s\"." @@ -14618,7 +14520,7 @@ msgstr "Regularny" msgid "Regular expression" msgstr "Wyrażenie regularne" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "Wyrażenie regularne \"%1$s\" już istnieje." @@ -14879,7 +14781,7 @@ msgid "Replace dependencies" msgstr "Zamień zależności" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -15076,7 +14978,7 @@ msgstr "Typ odpowiedzi: łańcuch znaków" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Wynik" @@ -15317,7 +15219,7 @@ msgstr "Port SMTP serwera" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15618,7 +15520,7 @@ msgstr "Zakres" msgid "Script" msgstr "Skrypt" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Skrypt \"%1$s\" już istnieje." @@ -15733,7 +15635,7 @@ msgid "Security name" msgstr "Nazwa ochrony" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15949,11 +15851,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Czas początkowy usługi musi być mniejszy od czasu końcowego." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15965,7 +15867,7 @@ msgstr "" msgid "Service times" msgstr "Czasy usługi" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Typ usługi" @@ -15978,7 +15880,7 @@ msgstr "" msgid "Service updated" msgstr "Zaktualizowano usługę" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15990,7 +15892,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -16008,9 +15910,9 @@ msgstr "" msgid "Session initialization error." msgstr "Błąd inicjalizacji sesji." -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Sesja zakończona, proszę zalogować się ponownie." @@ -16072,7 +15974,7 @@ msgstr "Ustawienia" #: 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16917,10 +16819,10 @@ msgstr "Tabela \"%1$s\" nie posiada pola o nazwie \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Etykieta" @@ -17057,7 +16959,7 @@ msgstr "Szablon" msgid "Template \"%1$s\" already exists." msgstr "Szablon \"%1$s\" już istnieje." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17141,7 +17043,7 @@ msgstr "Szablon o takiej samej widocznej nazwie \"%s\" już istnieje." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17440,7 +17342,7 @@ msgstr "Do" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17851,7 +17753,7 @@ msgstr "Zaktualizowano wyzwalacz" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17915,9 +17817,9 @@ msgstr "Dwa elementy mapy powinny być wybrane" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17927,7 +17829,7 @@ msgstr "Dwa elementy mapy powinny być wybrane" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17979,7 +17881,7 @@ msgstr "Typ informacji" msgid "Types" msgstr "Typy" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -18050,8 +17952,8 @@ msgstr "URL powinien mieć oba pola \"name\" (nazwa) i \"url\" dla mapy \"%1$s\" msgid "URLs" msgstr "Adresy URL" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18161,21 +18063,23 @@ msgstr "Jednostki" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Nieznany" @@ -18193,7 +18097,7 @@ msgid "Unknown error" msgstr "Nieznany błąd" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Nieznana pozycja hosta, taka pozycja nie istnieje na wybranym hoście" @@ -18333,7 +18237,7 @@ msgstr "Działa" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18467,37 +18371,37 @@ msgstr "Wykorzystywane w akcjach" msgid "User" msgstr "Użytkownik" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "Użytkownik \"%1$s\" nie może istnieć bez grupy użytkowników." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "Użytkownik \"%1$s\" jest właścicielem panelu \"%2$s\"." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "Użytkownik \"%1$s\" jest właścicielem mapy \"%2$s\"." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "Użytkownik \"%1$s\" używa akcji \"%2$s\"." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18519,13 +18423,13 @@ msgstr "Dodano użytkownika" msgid "User agent string" msgstr "Ciąg znaków agenta użytkownika" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Użytkownik nie może dodać samego siebie do wyłączonej grupy lub do grupy z wyłączonym dostępem do interfejsu użytkownika." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "Użytkownik nie może zmienić własnej roli." @@ -18550,27 +18454,27 @@ msgstr[2] "" msgid "User group" msgstr "Grupa użytkowników" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Grupa użytkowników \"%1$s\" już istnieje." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "Grupa użytkownika \"%1$s\" używa w akcji \"%2$s\"." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Grupa użytkowników \"%1$s\" została użyta w konfiguracji dla komunikatów zatrzymania bazy danych." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Grupa użytkowników \"%1$s\" jest wykorzystywana w skrypcie \"%2$s\"." @@ -18606,9 +18510,9 @@ msgstr[2] "Zaktualizowanych grup użytkownika" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "Grupa użytkownika o ID \"%1$s\" jest niedostępna." @@ -18623,7 +18527,7 @@ msgstr "Grupa użytkownika o ID \"%1$s\" jest niedostępna." msgid "User groups" msgstr "Grupy użytkowników" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Użytkownik nie może siebie usunąć." @@ -18658,7 +18562,7 @@ msgstr "Profil użytkownika" msgid "User role" msgstr "Rola użytkownika" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18678,7 +18582,7 @@ msgstr[2] "Usuniętych rówl użtykownika" msgid "User role updated" msgstr "Zaktualizowana role użytkownika" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "Rola użytkownika o ID \"%1$s\" jest niedostępna." @@ -18729,12 +18633,12 @@ msgstr "Zaktualizowano użytkownika" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "Użytkownik o ID \"%1$s\" jest niedostępny." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -19045,14 +18949,14 @@ msgstr "Sprawdzenie" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19164,11 +19068,12 @@ msgstr "Wartość jakichkolwiek liczników wydajności Windows po angielsku. Zwr msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Wartość dowolnego licznika wydajności Windows. Zwraca liczbę całkowitą, zmiennoprzecinkową, ciąg znaków lub tekst (zależnie od zapytania)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "Wartość nowego zdarzenia znacznika" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "Wartość starego zdarzenia znacznika" @@ -19707,7 +19612,7 @@ msgstr "Rocznie" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19764,7 +19669,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "Nie określiłeś celów dla operacji akcji globalnego skryptu \"%1$s\"." #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19897,11 +19801,11 @@ msgstr "[Błędna wartość dla dnia: \"%1$s\" ]" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "[Błędna wartość dla miesiąca: \"%1$s\" ]" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "oczekiwano nazwy DNS" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "oczekiwana wartość boolowska" @@ -19909,16 +19813,16 @@ msgstr "oczekiwana wartość boolowska" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "oczekiwano ciągu znaków" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19927,37 +19831,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "oczekiwano zmiennoprzecinkowej wartości punktu" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "oczekiwane wykrywanie makra niskiego poziomu" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "liczba ma za dużo cyfr po przecinku" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "oczekiwano liczby" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "oczekiwana liczba jest za duża" @@ -19978,7 +19882,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19986,19 +19890,19 @@ msgstr "" msgid "a time is expected" msgstr "oczekiwano czasu" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "oczekiwano okresu czasu" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: include/validate.inc.php:221 msgid "a time range is expected" msgstr "oczekiwano zakresu czasu" #: app/controllers/CControllerPopupHttpStep.php:94 #: app/controllers/CControllerPopupLldOperation.php:154 -#: include/classes/validators/CApiInputValidator.php:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -20048,7 +19952,7 @@ msgstr "wszystkie" msgid "all media" msgstr "wszystkie media" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "oczeiwano adresu IP" @@ -20070,23 +19974,23 @@ msgstr "oczeiwano adresu IP" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "oczekiwano tablicy" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "oczekiwano tablicy lub ciągu znaku" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -20096,7 +20000,7 @@ msgid "an empty string is expected" msgstr "oczekiwano pustego ciągu znaków" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "oczekiwano parzystej liczby znaków heksadecymalnych" @@ -20104,11 +20008,15 @@ msgstr "oczekiwano parzystej liczby znaków heksadecymalnych" msgid "an explicit time is expected" msgstr "oczekiwano jawnego czasu" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "oczekiwano liczby całkowitej" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "oczekiwano liczby całkowitej bez znaku" @@ -20269,13 +20177,7 @@ msgstr "nie może być zmieniony" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20306,13 +20208,13 @@ msgstr "nie może być zmieniony" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20330,14 +20232,14 @@ msgstr "nie może być zmieniony" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20410,7 +20312,8 @@ msgid "configure" msgstr "konfiguracja" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "zawiera" @@ -20501,7 +20404,7 @@ msgstr "malejąco" msgid "description" msgstr "opis" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20523,13 +20426,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "nie zawiera" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "nie równa się" @@ -20555,7 +20458,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20592,7 +20496,7 @@ msgstr "wyrażenie jest puste" msgid "failed to parse JSON" msgstr "nieudane przetwarzanie JSON" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20683,7 +20587,7 @@ msgstr "ikona" msgid "image" msgstr "obraz" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20728,15 +20632,19 @@ msgstr "nieprawidłowa liczność elementu" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "niepoprawna składnia przy \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20764,7 +20672,7 @@ msgstr "niepoprawny wzór Prometeusza" msgid "invalid address range \"%1$s\"" msgstr "niepoprawny zakres adresu \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "niepoprawna sekwencja bajtów w UTF-8" @@ -20793,27 +20701,27 @@ msgstr "" msgid "invalid history storage period" msgstr "niepoprawny okres przechowywania historii" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "niepoprawna nazwa grupy hosta" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "niepoprawna nazwa hosta" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "niepoprawne wyrażenie regularne" @@ -20841,7 +20749,7 @@ msgstr "jest większe niż lub równe" msgid "is less than or equals" msgstr "jest mniejsze niż lub równe" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "nie jest zamknięty w () albo jest zniekształcony" @@ -20991,7 +20899,7 @@ msgstr "pasuje do" msgid "max" msgstr "maks" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "maksymalny okres jest mniejszy niż filtr czasu domyślnego okresu" @@ -21031,7 +20939,7 @@ msgid "min() - Minimum value for period T" msgstr "min() - Minimalna wartość dla okresu T" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "minimalna ilość znaków: %1$s" @@ -21058,8 +20966,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -21080,8 +20988,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "musi zawierać co najmniej jedno makro wykrywania niskiego poziomu" @@ -21297,6 +21205,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21342,11 +21254,11 @@ msgstr "" msgid "regular expression" msgstr "wyrażenie regularne" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21358,15 +21270,15 @@ msgstr "wymiana" msgid "right" msgstr "prawidłowy" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21414,7 +21326,7 @@ msgstr "" msgid "short description" msgstr "krótki opis" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21433,15 +21345,15 @@ msgstr "krótki opis" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "powinno być puste" @@ -21457,31 +21369,31 @@ msgstr "pokaż mapowanie ikon" msgid "sign in as guest" msgstr "zaloguj się jako gość" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21489,15 +21401,15 @@ msgstr "" msgid "sum" msgstr "suma" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "sum() - Suma wartości okresu T" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "dostarczone dane logowania nie są unikalne" @@ -21510,7 +21422,7 @@ msgstr "dostarczone dane logowania nie są unikalne" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21521,7 +21433,7 @@ msgstr "dostarczone dane logowania nie są unikalne" msgid "tag" msgstr "znacznik" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21530,14 +21442,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "szablon o ID \"%1$s\" został przekazany %2$s razy" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21549,20 +21461,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "brakujący parametr \"%1$s\"" @@ -21594,7 +21506,7 @@ msgstr "trzeci" msgid "third parameter is expected" msgstr "oczekiwano trzeciego parametru" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "czas domyślnego okresu filtra osiągnął maksymalny okres" @@ -21602,31 +21514,31 @@ msgstr "czas domyślnego okresu filtra osiągnął maksymalny okres" msgid "time shift" msgstr "przesunięcie czasu" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "time() - Aktualny czas" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft() - Czas do osiągnięcia progu oszacowanego na podstawie okresu T" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "trendavg() - Średnia wartość okresu T z dokładnym przesunięciem okresu" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "trendmax() - Maksymalna wartość okresu T z dokładnym przesunięciem okresu" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "trendmin() - Minimalna wartość okresu T z dokładnym przesunięciem okresu" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "trendsum() - Suma wartości okresu T z dokładnym przesunięciem okresu" @@ -21640,7 +21552,7 @@ msgstr "wyzwalacz" msgid "trigger does not allow manual closing" msgstr "wyzwalacz nie zezwala na ręczne zamknięcie" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21652,11 +21564,11 @@ msgstr "prototyp wyzwalacza nie może zostać przeniesiony do innego szablonu lu msgid "trigger with linkages cannot be moved to another template or host" msgstr "wyzwalacz z odsyłaczami nie może być przesuwany do innego szablonu lub hosta" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21665,7 +21577,7 @@ msgstr "" msgid "type here to search" msgstr "wpisz tekst do wyszukania" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "nieakceptowalny URL" @@ -21713,11 +21625,12 @@ msgstr "nieoczekiwany koniec makra" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "nieoczekiwany parametr \"%1$s\"" @@ -21743,8 +21656,8 @@ msgstr "nieoczekiwany tekst \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21769,6 +21682,10 @@ msgstr "niewspierany przyrostek czasu" msgid "unsupported version number" msgstr "niewspierany numer wersji" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21826,61 +21743,71 @@ msgstr "nie znaleziono wartości \"%1$s\"" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "watość %1$s już istnieje" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "wartość jest za długa" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21911,15 +21838,13 @@ msgstr "wartość musi być nie mniejsza niż \"%1$s\"" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "wartośc musi być jedna z %1$s" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21928,7 +21853,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "wartośc pierwszego parametru jest za długa" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "wartość nowego znacznika zdarzenia" @@ -21941,11 +21866,11 @@ msgstr "wartość drugiego paramteru jest za długa" msgid "value of third parameter must be one of %1$s" msgstr "wartość trzecigo paramteru mysu być jedną z %1$s" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/pt_BR/LC_MESSAGES/frontend.po b/ui/locale/pt_BR/LC_MESSAGES/frontend.po index 49390bcdaa2..a741ea2d51f 100644 --- a/ui/locale/pt_BR/LC_MESSAGES/frontend.po +++ b/ui/locale/pt_BR/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2021-01-25 11:38+0300\n" "Last-Translator: Marlon <Marlon@outlook.com>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -500,7 +500,7 @@ msgstr "Reconhecer" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Reconhecido" @@ -599,7 +599,7 @@ msgstr "A ação \"%1$s\" já existe." msgid "Action \"%1$s\" no operations defined." msgstr "A ação \"%1$s\" não possui operadores definidos." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -725,7 +725,7 @@ msgstr "Ativo até" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -736,7 +736,7 @@ msgstr "Ativo até" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -993,7 +993,7 @@ msgstr "Idade menor que" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1317,7 +1317,7 @@ msgstr "Às (horas:minutos)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1326,8 +1326,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1338,6 +1338,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "Ao menos um grupo de host ou host deve ser selecionado." +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1349,7 +1354,7 @@ msgstr "No mínimo um período de manutenção deve ser definido." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1435,7 +1440,7 @@ msgstr "Autenticação" msgid "Authentication algorithm" msgstr "Algoritmo de autenticação" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "Falha de autenticação: %1$s." @@ -1484,7 +1489,7 @@ msgstr "Auto" msgid "Auto-login" msgstr "Login automático" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Não é possível habilitar as opções de login automático e logout automático ao mesmo tempo." @@ -1495,7 +1500,7 @@ msgstr "Logout automático" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1754,7 +1759,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1789,7 +1794,7 @@ msgstr "Retorno" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1995,7 +2000,7 @@ msgstr "Não foi possível se conectar ao servidor LDAP." msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2117,7 +2122,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Não é possível excluir o usuário interno do Zabbix \"%1$s\", tente desabilitar esse usuário." @@ -2126,7 +2131,7 @@ msgstr "Não é possível excluir o usuário interno do Zabbix \"%1$s\", tente d msgid "Cannot delete action" msgstr "Ação não foi excluída" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2194,7 +2199,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2265,7 +2270,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "Não foi possível excluir proxy" msgstr[1] "Não foi possível excluir proxy" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2288,7 +2293,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "Não foi possível excluir script" msgstr[1] "Não foi possível excluir script" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Não foi possível excluir os scripts. Script \"%1$s\" é usado na operação de ação \"%2$s\"." @@ -2682,16 +2687,16 @@ msgstr "Não foi possível localizar o mapeamento de valores \"%1$s\" utilizado msgid "Cannot have empty visible template name." msgstr "Não é possível ter um template sem nome visível." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2704,7 +2709,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "Não foi possível importar o template \"%1$s\", vinculado com o template \"%2$s\" que não existe." msgstr[1] "Não foi possível importar o template \"%1$s\", vinculado com os templates \"%2$s\" que não existem." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Não foi possível incluir a expressão de trigger" @@ -2725,7 +2730,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2787,7 +2792,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Não é possível receber a resposta, verifique a comunicação com o servidor Zabbix \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Não é possível renomear o usuário convidado." @@ -2870,7 +2875,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Não foi possível desvincular e limpar os cenários web." @@ -2883,7 +2888,7 @@ msgstr "Falha na desassociação do template" msgid "Cannot unlink template." msgstr "Não foi possível desvincular ao template." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2945,9 +2950,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Não é possível atualizar um gráfico descoberto." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Não é possível atualizar um grupo de hosts descoberto." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3006,9 +3012,7 @@ msgstr "Não foi possível atualizar o protótipo de gráfico" msgid "Cannot update group" msgstr "Grupo não foi atualizado" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Não é possível atualizar os grupos para o host descoberto \"%1$s\"." @@ -3091,12 +3095,12 @@ msgstr "Não foi possível atualizar mapa de rede" msgid "Cannot update proxy" msgstr "Não foi possível atualizar proxy" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Não é possível atualizar o proxy para o host descoberto \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3116,9 +3120,9 @@ msgstr "" msgid "Cannot update script" msgstr "Não foi possível atualizar script" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3301,8 +3305,8 @@ msgid "Character string not included" msgstr "Sequência de caracteres não incluídos" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3478,7 +3482,7 @@ msgstr "Relógio" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3516,13 +3520,13 @@ msgstr "Fechar" msgid "Close expression constructor" msgstr "Fechar construtor de expressão" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Fechar novo evento" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Fechar eventos antigos" @@ -3619,7 +3623,7 @@ msgstr "Compressão" msgid "Concurrent sessions" msgstr "Sessões concorrentes" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3630,11 +3634,6 @@ msgstr "Condição" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "A condição \"%2$s\" não é utilizada na fórmula \"%3$s\" da ação \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "A condição \"%2$s\" não é utilizada na fórmula \"%3$s\" para o correlacionamento \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3650,11 +3649,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" para a ação \"%1$s\" não foi definida." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" para o correlacionamento \"%1$s\" não foi definida." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3846,7 +3840,7 @@ msgstr "Mensagem de confirmação" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Parabéns! Você instalou com sucesso a interface web do Zabbix." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4048,12 +4042,11 @@ msgstr "Copiar" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Correlacionamento" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "O correlacionamento \"%1$s\" já existe." @@ -4081,16 +4074,6 @@ msgid_plural "Correlations enabled" msgstr[0] "Correlacionamento ativado" msgstr[1] "Correlacionamentos ativados" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "Correlacionamento com parâmetro ausente: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "O nome do correlacionamento não pode ser vazio." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Regra de correlação" @@ -4101,8 +4084,8 @@ msgstr "Correlacionamento atualizado" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Contador" @@ -4474,7 +4457,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "Nome DNS" @@ -4749,8 +4732,8 @@ msgstr "Dez" msgid "December" msgstr "Dezembro" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4760,7 +4743,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4857,7 +4840,7 @@ msgstr "Atrasado por" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4907,7 +4890,7 @@ msgstr "Excluir e limpar template? (Aviso: todos os hosts associados terão as e msgid "Delete current action?" msgstr "Excluir a ação atual?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Excluir o correlacionamento atual?" @@ -5206,7 +5189,7 @@ msgstr "" msgid "Dependencies" msgstr "Dependências" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Dependente" @@ -5214,7 +5197,7 @@ msgstr "Dependente" msgid "Dependent item" msgstr "Item dependente" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5423,10 +5406,10 @@ msgstr "Desativar os cenários web selecionados?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5509,7 +5492,7 @@ msgid "Discovery by proxy" msgstr "Descoberta por proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Verificação de descoberta" @@ -5521,7 +5504,7 @@ msgstr "Verificações de descoberta" msgid "Discovery list" msgstr "Lista de descoberta" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Objeto de descoberta" @@ -5621,7 +5604,7 @@ msgstr "Regra de autobusca atualizada" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5632,7 +5615,7 @@ msgstr "Regras de descoberta" msgid "Discovery rules deleted" msgstr "A regra de descoberta foi excluída" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Status da descoberta de rede" @@ -5789,19 +5772,6 @@ msgstr "Desenhar" msgid "Draw style" msgstr "Estilo" -# Need more information about this... to translate. -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "Valor \"%1$s\" duplicado \"%2$s\" para a correlação \"%3$s\"." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Valor \"%1$s\" duplicado \"%2$s\" naa correlaçã." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5814,11 +5784,6 @@ msgstr "O valor informado para o \"nome\" do mapa \"%1$s\" está duplicado." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5978,10 +5943,6 @@ msgstr "Arquivo de chave SSL ausente para o cenário web \"%1$s\"." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "ID de correlação vazio." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6008,11 +5969,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6197,7 +6156,7 @@ msgstr "Ativar traps" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6208,7 +6167,7 @@ msgstr "Ativar traps" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6251,7 +6210,7 @@ msgid "English (en_US)" msgstr "Inglês (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6326,7 +6285,7 @@ msgid "Event correlation" msgstr "Correlacionamento de eventos" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Regras de correlacionamento de eventos" @@ -6361,11 +6320,11 @@ msgstr "Monitoração do log de eventos. Retorna: log" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Conjunto de etiqueta de evento" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Tipo do evento" @@ -6701,7 +6660,6 @@ msgstr "O campo \"%1$s\" não pode ser definido como NULO." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7069,7 +7027,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Expressão informada não é uma macro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "A expressão regular \"%1$s\" não existe." @@ -7314,12 +7272,12 @@ msgstr "Grade" msgid "Group" msgstr "Grupo" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "O grupo \"%1$s\" não pode ser excluído por ser utilizado em um protótipo de host." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "O grupo \"%1$s\" não pode ser excluído, pois é utilizado em condição de correlacionamento." @@ -7651,7 +7609,7 @@ msgstr[1] "Hosts" msgid "Host \"%1$s\" already exists." msgstr "O host \"%1$s\" já existe." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7659,7 +7617,7 @@ msgstr "O host \"%1$s\" já existe." msgid "Host \"%1$s\" cannot be without host group." msgstr "O host \"%1$s\" não pode ficar sem grupo." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7730,17 +7688,17 @@ msgstr[1] "Hosts ativados" msgid "Host group" msgstr "Grupo de hosts" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "O grupo de hosts \"%1$s\" já existe." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "O grupo de hosts \"%1$s\" não pode ser excluído pois é utilizado por um script global." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7754,9 +7712,9 @@ msgid "Host group label type" msgstr "Tipo de rótulo do grupo de hosts" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível." @@ -7772,8 +7730,8 @@ msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7960,7 +7918,7 @@ msgstr "Já existe um host com o nome visível \"%1$s\"." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8048,7 +8006,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "Endereço IP" @@ -8073,7 +8031,7 @@ msgstr "O range de IP \"%1$s\" excede o limite de endereços \"%2$s\"" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8130,12 +8088,12 @@ msgstr "Realce de ícone" msgid "Icon map" msgstr "Mapeamento de ícone" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "O mapeamento de ícones \"%1$s\" não pode ser excluído. Ele é usado no mapa \"%2$s\"." @@ -8159,7 +8117,7 @@ msgstr "Mapeamento de ícone atualizado" msgid "Icon mapping" msgstr "Mapeamento de ícones" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "O ícone com o ID \"%1$s\" não está disponível." @@ -8390,7 +8348,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8403,11 +8361,11 @@ msgstr "Mapa inacessível" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "Template inacessível" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "Trigger inacessível" @@ -8619,24 +8577,6 @@ msgstr "Ação com operação de grupo de usuário inválido. O grupo de usuári msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Ação com operação de usuário inválido. O usuário não existe ou você não possui acesso a este usuário." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8721,20 +8661,11 @@ msgstr "Condição inválida para a ação \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Condições incorretas para a regra de descoberta \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "ID de correlacionamento inválido." - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "A expressão personalizada \"%2$s\" é inválida para a ação \"%1$s\": %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "A expressão customizada \"%2$s\" é inválida para o correlacionamento \"%1$s\": \"%3$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8799,11 +8730,6 @@ msgstr "A condição de filtro no ID da fórmula é inválida a ação \"%1$s\". msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "O ID de condição da formula utilizada pela regra de descoberta \"%1$s\" está incorreto." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "A condição de filtro possui ID de fórmula incorreto para o correlacionamento \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8911,7 +8837,7 @@ msgstr "ID de mapa inválido." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Método incorreto \"%1$s.%2$s\"." @@ -9025,11 +8951,6 @@ msgstr "O protótipo de trigger possui expressão inválida. A expressão não p msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "O tipo de calculo é inválido para a ação \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "Tipo inválido de cálculo para o correlacionamento \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9051,10 +8972,10 @@ msgstr "Foi informado um ID de usuário inválido para o mapa \"%1$s\"." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "O ID de grupo de usuários informado para o mapa \"%1$s\" é inválido." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9116,18 +9037,6 @@ msgstr "O valor \"%1$s\" é inválido para o campo \"%2$s\" - espera-se um núme msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "O valor \"%1$s\" é inválido para o campo \"%2$s\" - espera-se um número inteiro positivo." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "O valor \"%1$s\" no campo \"%2$s\" é inválido para o correlacionamento \"%3$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9189,12 +9098,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9306,7 +9209,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9317,9 +9220,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9470,7 +9373,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Inserir" @@ -9599,7 +9502,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Intervalo" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9622,7 +9525,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "Condição inválida na ação: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9636,7 +9539,7 @@ msgstr "Data inválida." msgid "Invalid email address \"%1$s\"." msgstr "Endereço de e-mail inválido: \"%1$s\"." -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "Endereço de e-mail inválido para o tipo de mídia com o ID \"%1$s\"." @@ -9683,9 +9586,11 @@ msgstr "Os parâmetros do método são inválidos." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9725,17 +9630,17 @@ msgstr "Os parâmetros do método são inválidos." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9743,14 +9648,14 @@ msgstr "Os parâmetros do método são inválidos." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9758,111 +9663,116 @@ msgstr "Os parâmetros do método são inválidos." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10075,7 +9985,7 @@ msgstr[1] "Itens ativados" msgid "Item in \"not supported\" state" msgstr "O item está como \"não suportado\"" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Item não selecionado" @@ -10254,7 +10164,7 @@ msgstr "Itens atualizados" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10447,7 +10357,7 @@ msgstr "Localização do texto" msgid "Language" msgstr "Idioma" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11048,7 +10958,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11290,7 +11200,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "O período máximo a ser exibido é de %1$s dia." msgstr[1] "O período máximo a ser exibido é de %1$s dias." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "O tamanho máximo do endereço de e-mail foi excedito para o tipo de mídia com o ID \"%1$s\"." @@ -11315,7 +11225,7 @@ msgstr "Mídia" msgid "Media type" msgstr "Tipo de mídia" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "O tipo de mídia \"%1$s\" já existe." @@ -11359,7 +11269,7 @@ msgstr "" msgid "Media type updated" msgstr "Mídia atualizada" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "O tipo de mídia com o ID \"%1$s\" não está disponível." @@ -11371,7 +11281,7 @@ msgstr "O tipo de mídia com o ID \"%1$s\" não está disponível." msgid "Media types" msgstr "Tipos de mídias" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11618,7 +11528,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12020,15 +11930,17 @@ msgstr "Novo dashboard" msgid "New element" msgstr "Novo elemento" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "Novo evento no grupo de hosts" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Novo valor para a etiqueta de eventos" @@ -12048,7 +11960,7 @@ msgstr "" msgid "New service time" msgstr "Novo horário de serviço" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12075,7 +11987,7 @@ msgstr "Próximo passo" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12104,30 +12016,6 @@ msgstr "Próximo passo" msgid "No" msgstr "Não" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "Não foi encontrado \"%1$s\" para o correlacionamento \"%2$s\"." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "Não foi encontrado \"%1$s\" para o correlacionamento." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12177,11 +12065,6 @@ msgstr "Não foi especificado o nome de usuário." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "Sem tipo de condição para o correlacionamento \"%1$s\"." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12322,17 +12205,46 @@ msgstr "Nenhuma correspondência encontrada" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "Sem tipo de operação para o correlacionamento \"%1$s\"." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Sem permissão de acesso ao sistema." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12368,10 +12280,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12399,13 +12310,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12425,8 +12341,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12449,24 +12365,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12488,16 +12404,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12553,7 +12469,7 @@ msgstr "Nenhuma trigger definida." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Marcadores não booleanos serão descontinuados." @@ -12623,15 +12539,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Não autorizado para definir a senha do usuário \"guest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12965,15 +12881,16 @@ msgstr "Inativo" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Valor antigo da etiqueta de evento" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12995,10 +12912,6 @@ msgstr "Uma vez" msgid "One" msgstr "Um" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Um dos objetos está sem um grupo de hosts." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Apenas uma vez" @@ -13008,10 +12921,6 @@ msgstr "Apenas uma vez" msgid "One-time downtime" msgstr "Downtime único" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Apenas os super administradores podem criar grupos de hosts." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Apenas através de verificações com o agente Zabbix, SNMPv1, SNMPv2 e SNMPv3 pode ser feita a verificação de unicidade." @@ -13060,10 +12969,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Apenas super administradores podem criar correlacionamentos." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "Apenas super administradores podem definir um proprietario de dashboard." @@ -13072,10 +12977,6 @@ msgstr "Apenas super administradores podem definir um proprietario de dashboard. msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Apenas super administradores podem atualizar correlacionamentos." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Somente triggers de hosts ativados e dependentes de itens ativados são contadas" @@ -13124,7 +13025,7 @@ msgstr "A operação não possui template para operar." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13133,33 +13034,33 @@ msgstr "" msgid "Operations" msgstr "Operações" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operador" @@ -13568,16 +13469,16 @@ msgstr "" msgid "Parameter" msgstr "Parâmetro" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "O parâmetro \"%1$s\" será descontinuado." @@ -13714,7 +13615,7 @@ msgstr "" msgid "Paste without external links" msgstr "Colar sem os links externos" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13760,7 +13661,7 @@ msgstr "Executa uma consulta DNS. Retorna: texto com o tipo de informação requ #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13893,7 +13794,7 @@ msgstr "Preencha o campo do inventário do host" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14213,7 +14114,7 @@ msgstr "Proxies" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14221,7 +14122,7 @@ msgstr "Proxies" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14231,12 +14132,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "O proxy \"%1$s\" para o host \"%2$s\" não existe." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "O proxy \"%1$s\" é utilizado pela ação \"%2$s\"." -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "O proxy \"%1$s\" é utilizado pela regra de descoberta \"%2$s\"." @@ -14511,7 +14412,7 @@ msgstr "Comum" msgid "Regular expression" msgstr "Expressão regular" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14771,7 +14672,7 @@ msgid "Replace dependencies" msgstr "Substituir dependências" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14968,7 +14869,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Resultado" @@ -15209,7 +15110,7 @@ msgstr "Porta do servidor SMTP" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15507,7 +15408,7 @@ msgstr "Escopo" msgid "Script" msgstr "Script" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "O scritp \"%1$s\" já existe." @@ -15621,7 +15522,7 @@ msgid "Security name" msgstr "Nome de segurança" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15836,11 +15737,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "O horário de início do serviço deve ser menor que o horário de fim." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15852,7 +15753,7 @@ msgstr "" msgid "Service times" msgstr "Horário de serviço" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Tipo de serviço" @@ -15865,7 +15766,7 @@ msgstr "" msgid "Service updated" msgstr "Serviços atualizados" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15877,7 +15778,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15895,9 +15796,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Sessão terminada, conecte-se novamente por favor." @@ -15959,7 +15860,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16804,10 +16705,10 @@ msgstr "A tabela \"%1$s\" não possui um campo chamado \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Plaqueta" @@ -16944,7 +16845,7 @@ msgstr "Template" msgid "Template \"%1$s\" already exists." msgstr "O template \"%1$s\" já existe." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17028,7 +16929,7 @@ msgstr "Já existe template com o nome visível \"%1$s\"." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17325,7 +17226,7 @@ msgstr "Até" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17732,7 +17633,7 @@ msgstr "Trigger atualizada" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17796,9 +17697,9 @@ msgstr "Dois elementos do mapa devem ser serlecionados" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17808,7 +17709,7 @@ msgstr "Dois elementos do mapa devem ser serlecionados" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17860,7 +17761,7 @@ msgstr "Tipo de informação" msgid "Types" msgstr "Tipos" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17931,8 +17832,8 @@ msgstr "A URL deverá possuir os campos \"name\" e \"url\" no mapa \"%1$s\"." msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18042,21 +17943,23 @@ msgstr "Unidades" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Desconhecido" @@ -18074,7 +17977,7 @@ msgid "Unknown error" msgstr "Erro desconhecido" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Item de host desconhecido; não existe este item no host selecionado" @@ -18213,7 +18116,7 @@ msgstr "Ligado" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18347,37 +18250,37 @@ msgstr "Usado nas ações" msgid "User" msgstr "Usuário" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "O usuário \"%1$s\" não pode ficar sem grupo." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "O usuário \"%1$s\" é o proprietário do dashboad \"%2$s\"." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "O usuário \"%1$s\" é o proprietário do mapa \"%2$s\"." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "O usuário \"%1$s\" é utilizado na ação \"%2$s\"." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18399,13 +18302,13 @@ msgstr "Usuário incluído" msgid "User agent string" msgstr "Mensagem do agente de usuário" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Um usuário não pode se adicionar em um grupo desativado ou em um grupo com acesso à interface web desativado." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18429,27 +18332,27 @@ msgstr[1] "" msgid "User group" msgstr "Grupo de usuários" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "O grupo \"%1$s\" já existe." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "O grupo de usuários \"%1$s\" é utilizado na ação \"%2$s\"." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "O grupo de usuários \"%1$s\" está configurado para alerta de quedas de banco de dados." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "O grupo de usuários \"%1$s\" é utilizado pelo script \"%2$s\"." @@ -18483,9 +18386,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "O grupo de usuários com o ID \"%1$s\" não está disponível." @@ -18500,7 +18403,7 @@ msgstr "O grupo de usuários com o ID \"%1$s\" não está disponível." msgid "User groups" msgstr "Grupos de usuários" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Um usuário não pode excluir a sí próprio." @@ -18535,7 +18438,7 @@ msgstr "Dados personalizados do usuário" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18554,7 +18457,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18604,12 +18507,12 @@ msgstr "Usuário atualizado" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "O usuário com o ID \"%1$s\" não está disponível." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18920,14 +18823,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19039,11 +18942,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Valor de um contador de performance do Windows. Retorna: inteiro, número fracionário ou texto (dependendo da requisição)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19580,7 +19484,7 @@ msgstr "Anual" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19637,7 +19541,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19770,11 +19673,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "é aguardado um valor booleano" @@ -19782,16 +19685,16 @@ msgstr "é aguardado um valor booleano" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "um texto é esperado" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19800,37 +19703,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "é aguardado um valor numérico" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "número muito grande" @@ -19851,7 +19754,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19859,19 +19762,19 @@ msgstr "" msgid "a time is expected" msgstr "um horário é aguardado" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "é aguardado um período de tempo" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: include/validate.inc.php:221 msgid "a time range is expected" msgstr "um período de tempo é aguardado" #: app/controllers/CControllerPopupHttpStep.php:94 #: app/controllers/CControllerPopupLldOperation.php:154 -#: include/classes/validators/CApiInputValidator.php:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19921,7 +19824,7 @@ msgstr "todos" msgid "all media" msgstr "todas as mídias" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19943,23 +19846,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "um array é aguardado" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "é esperado um array ou sequência de caracteres" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19969,7 +19872,7 @@ msgid "an empty string is expected" msgstr "um texto vazio é esperado" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "é aguardado um par de caracteres hexadecimais" @@ -19977,11 +19880,15 @@ msgstr "é aguardado um par de caracteres hexadecimais" msgid "an explicit time is expected" msgstr "um horário explícito é esperado" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20142,13 +20049,7 @@ msgstr "não pode ser modificado" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20179,13 +20080,13 @@ msgstr "não pode ser modificado" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20203,14 +20104,14 @@ msgstr "não pode ser modificado" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20283,7 +20184,8 @@ msgid "configure" msgstr "configurar" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "contêm" @@ -20374,7 +20276,7 @@ msgstr "descedente" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20396,13 +20298,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "não contêm" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "não é igual" @@ -20428,7 +20330,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20465,7 +20368,7 @@ msgstr "a expressão está vazia" msgid "failed to parse JSON" msgstr "falha ao analisar o JSON" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20556,7 +20459,7 @@ msgstr "ícone" msgid "image" msgstr "imagem" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20601,15 +20504,19 @@ msgstr "contagem de elementos incorreta" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "sintaxe incorreta próximo de \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20638,7 +20545,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "intervalo de endereços inválido \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "sequência de bytes inválida no UTF-8" @@ -20667,27 +20574,27 @@ msgstr "" msgid "invalid history storage period" msgstr "período inválido para a retenção de histórico" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "nome inválido de grupo de hosts" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "nome inválido de host" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "expressão regular inválida" @@ -20715,7 +20622,7 @@ msgstr "é maior ou igual" msgid "is less than or equals" msgstr "é menor ou igual" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "não está entre {} ou está mal formado" @@ -20865,7 +20772,7 @@ msgstr "correspondências" msgid "max" msgstr "máx" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20905,7 +20812,7 @@ msgid "min() - Minimum value for period T" msgstr "min() - Valor mínimo em um período T" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "o tamanho mínimo é %1$s caracteres" @@ -20932,8 +20839,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20954,8 +20861,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "precisa conter ao menos uma macro de descoberta" @@ -21171,6 +21078,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21216,11 +21127,11 @@ msgstr "" msgid "regular expression" msgstr "expressão regular" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21232,15 +21143,15 @@ msgstr "" msgid "right" msgstr "direita" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21288,7 +21199,7 @@ msgstr "" msgid "short description" msgstr "descrição curta" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21307,15 +21218,15 @@ msgstr "descrição curta" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "deve estar vazio" @@ -21331,31 +21242,31 @@ msgstr "mostrar mapeamento de ícones" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21363,15 +21274,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "sum() - Total de valores em um período T" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "as credenciais informadas não são únicas" @@ -21384,7 +21295,7 @@ msgstr "as credenciais informadas não são únicas" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21395,7 +21306,7 @@ msgstr "as credenciais informadas não são únicas" msgid "tag" msgstr "etiqueta" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21404,14 +21315,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "template ID \"%1$s\" foi definido %2$s vezes" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21423,20 +21334,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "o parâmetro \"%1$s\" está ausente" @@ -21468,7 +21379,7 @@ msgstr "terceiro" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21476,31 +21387,31 @@ msgstr "" msgid "time shift" msgstr "mudança de horário" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "time() - Hora atual" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft() - Tempo para alcançar o limite estimado com base no período T" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21514,7 +21425,7 @@ msgstr "trigger" msgid "trigger does not allow manual closing" msgstr "a trigger não permite fechamento manual" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21526,11 +21437,11 @@ msgstr "um protótipo de trigger não pode ser movido para outro template ou hos msgid "trigger with linkages cannot be moved to another template or host" msgstr "uma trigger com associações não pode ser movida para outro template ou host" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21539,7 +21450,7 @@ msgstr "" msgid "type here to search" msgstr "informe aqui o argumento para pesquisa" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21587,11 +21498,12 @@ msgstr "fim inesperado da macro" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "parâmetro não aguardado: %1$s" @@ -21617,8 +21529,8 @@ msgstr "texto inesperado \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21643,6 +21555,10 @@ msgstr "" msgid "unsupported version number" msgstr "número de versão não suportado" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21700,61 +21616,69 @@ msgstr "o valor \"%1$s\" não foi encontrado" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "o valor %1$s já existe" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "o valor é muito grande" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21785,15 +21709,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "o valor precisa ser um de %1$s" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21802,7 +21724,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21815,11 +21737,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/pt_PT/LC_MESSAGES/frontend.po b/ui/locale/pt_PT/LC_MESSAGES/frontend.po index f9e70bcf638..c5df636a29a 100644 --- a/ui/locale/pt_PT/LC_MESSAGES/frontend.po +++ b/ui/locale/pt_PT/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2013-10-10 08:35+0300\n" "Last-Translator: richlv <richlv@nakts.net>\n" "Language-Team: none\n" @@ -499,7 +499,7 @@ msgstr "Reconhecer" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Reconhecido" @@ -598,7 +598,7 @@ msgstr "Acção \"%1$s\" já existe." msgid "Action \"%1$s\" no operations defined." msgstr "Acção \"%1$s\" sem operações definidas." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -724,7 +724,7 @@ msgstr "Activo até" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -735,7 +735,7 @@ msgstr "Activo até" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -991,7 +991,7 @@ msgstr "Idade menor que" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1313,7 +1313,7 @@ msgstr "Às (horas:minutos)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1322,8 +1322,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1334,6 +1334,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1345,7 +1350,7 @@ msgstr "Tem de ser criado pelo menos um período de manutenção." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1431,7 +1436,7 @@ msgstr "Autenticação" msgid "Authentication algorithm" msgstr "Algoritmo de autenticação" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1480,7 +1485,7 @@ msgstr "" msgid "Auto-login" msgstr "Login automático" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Não é possível activar as opções de login automático e logout automático ao mesmo tempo." @@ -1491,7 +1496,7 @@ msgstr "Logout automático" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1750,7 +1755,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1785,7 +1790,7 @@ msgstr "Callback" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1991,7 +1996,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2113,7 +2118,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Não é possível eliminar o utilizador interno do Zabbix \"%1$s\", tente desactivar esse utilizador." @@ -2122,7 +2127,7 @@ msgstr "Não é possível eliminar o utilizador interno do Zabbix \"%1$s\", tent msgid "Cannot delete action" msgstr "Não foi possível eliminar acção" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2190,7 +2195,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2261,7 +2266,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "Não foi possível eliminar proxy" msgstr[1] "Não foi possível eliminar proxy" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2284,7 +2289,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "Não foi possível eliminar script" msgstr[1] "Não foi possível eliminar script" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Não foi possível eliminar scripts. Script \"%1$s\" está a ser utilizado na acção \"%2$s\"." @@ -2678,16 +2683,16 @@ msgstr "Não foi possível localizar o mapeamento de valores \"%1$s\" utilizado msgid "Cannot have empty visible template name." msgstr "Não é possível ter um template sem nome visível." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2700,7 +2705,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "Não foi possível importar o template \"%1$s\", vinculado com o template \"%2$s\" que não existe." msgstr[1] "Não foi possível importar o template \"%1$s\", vinculado com os templates \"%2$s\" que não existem." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Não foi possível incluir a expressão de trigger" @@ -2721,7 +2726,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2783,7 +2788,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Não é possível receber a resposta, verifique a comunicação com o servidor Zabbix \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Não é possível renomear o utilizador convidado." @@ -2866,7 +2871,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Não foi possível desvincular e limpar os cenários web." @@ -2879,7 +2884,7 @@ msgstr "Não foi possível desvincular o template" msgid "Cannot unlink template." msgstr "Não foi possível desvincular ao template." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2941,9 +2946,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Não é possível actualizar um gráfico descoberto." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Não é possível actualizar um grupo de hosts descoberto." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3002,9 +3008,7 @@ msgstr "Não foi possível actualizar o protótipo de gráfico" msgid "Cannot update group" msgstr "Não foi possível actualizar o grupo" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Não é possível actualizar os grupos para o host descoberto \"%1$s\"." @@ -3087,12 +3091,12 @@ msgstr "Não foi possível actualizar o mapa de rede" msgid "Cannot update proxy" msgstr "Não foi possível actualizar o proxy" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Não é possível actualizar o proxy para o host descoberto \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3112,9 +3116,9 @@ msgstr "" msgid "Cannot update script" msgstr "Não foi possível actualizar o script" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3297,8 +3301,8 @@ msgid "Character string not included" msgstr "Sequência de caracteres não incluídos" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3474,7 +3478,7 @@ msgstr "Relógio" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3512,13 +3516,13 @@ msgstr "Fechar" msgid "Close expression constructor" msgstr "Fechar o construtor de expressões" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Fechar novo evento" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Fechar eventos antigos" @@ -3615,7 +3619,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "Sessões concorrentes" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3626,11 +3630,6 @@ msgstr "Condição" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "A condição \"%2$s\" não é utilizada na fórmula \"%3$s\" da acção \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "A condição \"%2$s\" não é utilizada na fórmula \"%3$s\" para o correlacionamento \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3646,11 +3645,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" para a acção \"%1$s\" não foi definida." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" para o correlacionamento \"%1$s\" não foi definida." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3842,7 +3836,7 @@ msgstr "Texto de confirmação" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Parabéns! Instalou com sucesso a interface web do Zabbix." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4044,12 +4038,11 @@ msgstr "Copiar" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Correlacionamento" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "O correlacionamento \"%1$s\" já existe." @@ -4077,16 +4070,6 @@ msgid_plural "Correlations enabled" msgstr[0] "Correlacionamento activado" msgstr[1] "Correlacionamentos activados" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "Correlacionamento com parâmetro ausente: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "O nome do correlacionamento não pode ser vazio." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Regra de correlação" @@ -4097,8 +4080,8 @@ msgstr "Correlacionamento actualizado" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Contador" @@ -4470,7 +4453,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "Nome DNS" @@ -4745,8 +4728,8 @@ msgstr "Dez" msgid "December" msgstr "Dezembro" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4756,7 +4739,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4853,7 +4836,7 @@ msgstr "Atrasado em" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4903,7 +4886,7 @@ msgstr "Eliminar e limpar template? (Atenção: todos os hosts associados serão msgid "Delete current action?" msgstr "Eliminar acção actual?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Eliminar o correlacionamento atual?" @@ -5202,7 +5185,7 @@ msgstr "" msgid "Dependencies" msgstr "Dependências" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Dependente" @@ -5210,7 +5193,7 @@ msgstr "Dependente" msgid "Dependent item" msgstr "Item dependente" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5419,10 +5402,10 @@ msgstr "Desactivar os cenários web selecionados?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5505,7 +5488,7 @@ msgid "Discovery by proxy" msgstr "Descoberta por proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Verificação de descoberta" @@ -5517,7 +5500,7 @@ msgstr "Verificações de descoberta" msgid "Discovery list" msgstr "Lista de descobertas" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Objecto de descoberta" @@ -5617,7 +5600,7 @@ msgstr "Regra de descoberta actualizada" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5628,7 +5611,7 @@ msgstr "Regras de descoberta" msgid "Discovery rules deleted" msgstr "Regras de descoberta eliminadas" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Estado da descoberta" @@ -5784,18 +5767,6 @@ msgstr "" msgid "Draw style" msgstr "Estilo de desenho" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "Valor \"%1$s\" duplicado \"%2$s\" para a correlação \"%3$s\"." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Valor \"%1$s\" duplicado \"%2$s\" na correlaçã." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5808,11 +5779,6 @@ msgstr "O valor fornecido para o \"nome\" do mapa \"%1$s\" está duplicado." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5972,10 +5938,6 @@ msgstr "Arquivo de chave SSL ausente para o cenário web \"%1$s\"." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "ID de correlação vazio." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6002,11 +5964,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6191,7 +6151,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6202,7 +6162,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6245,7 +6205,7 @@ msgid "English (en_US)" msgstr "Inglês (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6321,7 +6281,7 @@ msgid "Event correlation" msgstr "Correlacionamento de eventos" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Regras de correlacionamento de eventos" @@ -6356,11 +6316,11 @@ msgstr "Monitoração do log de eventos. Retorna: log" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Conjunto de etiqueta de evento" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Tipo do evento" @@ -6696,7 +6656,6 @@ msgstr "O campo \"%1$s\" não pode ser definido como NULO." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7064,7 +7023,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "A expressão fornecida não é uma macro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "A expressão regular \"%1$s\" não existe." @@ -7309,12 +7268,12 @@ msgstr "Grelha" msgid "Group" msgstr "Grupo" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "O grupo \"%1$s\" não pode ser eliminado por ser utilizado em um protótipo de host." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "O grupo \"%1$s\" não pode ser eliminado, pois é utilizado em condição de correlacionamento." @@ -7646,7 +7605,7 @@ msgstr[1] "Host" msgid "Host \"%1$s\" already exists." msgstr "O host \"%1$s\" já existe." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7654,7 +7613,7 @@ msgstr "O host \"%1$s\" já existe." msgid "Host \"%1$s\" cannot be without host group." msgstr "O host \"%1$s\" não pode ficar sem grupo." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7725,17 +7684,17 @@ msgstr[1] "Hosts activados" msgid "Host group" msgstr "Grupo de hosts" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Grupo de hosts \"%1$s\" já existe." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "O grupo de hosts \"%1$s\" não pode ser eliminado pois é utilizado por um script global." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7749,9 +7708,9 @@ msgid "Host group label type" msgstr "Tipo de etiqueta do grupo de hosts" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível." @@ -7767,8 +7726,8 @@ msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7955,7 +7914,7 @@ msgstr "Já existe um host com o nome visível \"%1$s\"." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8043,7 +8002,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "Endereço IP" @@ -8068,7 +8027,7 @@ msgstr "O range de IP \"%1$s\" excede o limite de endereços \"%2$s\"" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8125,12 +8084,12 @@ msgstr "Realce do ícone" msgid "Icon map" msgstr "Mapeamento de ícone" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "O mapeamento de ícone \"%1$s\" não pode ser eliminado. Está a ser utilizado no mapa \"%2$s\"." @@ -8154,7 +8113,7 @@ msgstr "O mapeamento de ícone actualizado" msgid "Icon mapping" msgstr "O mapeamento de ícone" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "O ícone com o ID \"%1$s\" não está disponível." @@ -8385,7 +8344,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8398,11 +8357,11 @@ msgstr "Mapa inacessível" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8614,24 +8573,6 @@ msgstr "A acção tem uma operação com grupo de utilizadores inválido. O grup msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "A acção tem uma operação com utilizador inválido. O utilizador não existe ou o utilizador não tem acesso a ele." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8716,20 +8657,11 @@ msgstr "Condição inválida para a acção \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Condições incorrectas para a regra de descoberta \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "ID de correlacionamento inválido." - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "A expressão personalizada \"%2$s\" é inválida para a acção \"%1$s\": %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "A expressão personalizada \"%2$s\" é inválida para o correlacionamento \"%1$s\": \"%3$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8794,11 +8726,6 @@ msgstr "A condição de filtro no ID da fórmula é inválida a acção \"%1$s\" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "O ID de condição da formula utilizada pela regra de descoberta \"%1$s\" está incorrecto." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "A condição de filtro possui ID de fórmula incorrecto para o correlacionamento \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8906,7 +8833,7 @@ msgstr "ID de mapa inválido." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Método incorrecto \"%1$s.%2$s\"." @@ -9020,11 +8947,6 @@ msgstr "O protótipo de trigger possui expressão inválida. A expressão não p msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "O tipo de calculo é inválido para a acção \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "Tipo inválido de cálculo para o correlacionamento \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9046,10 +8968,10 @@ msgstr "Foi fornecido um ID de utilizador inválido para o mapa \"%1$s\"." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "O ID de grupo de utilizadores fornecido para o mapa \"%1$s\" é inválido." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9111,18 +9033,6 @@ msgstr "O valor \"%1$s\" é inválido para o campo int \"%2$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "O valor \"%1$s\" é inválido para o campo unsigned int \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "O valor \"%1$s\" no campo \"%2$s\" é inválido para o correlacionamento \"%3$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9184,12 +9094,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9301,7 +9205,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9312,9 +9216,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9465,7 +9369,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Inserir" @@ -9594,7 +9498,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Intervalo" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9617,7 +9521,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "Condição inválida na acção: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9631,7 +9535,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9678,9 +9582,11 @@ msgstr "Parâmetros inválidos para o método." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9720,17 +9626,17 @@ msgstr "Parâmetros inválidos para o método." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9738,14 +9644,14 @@ msgstr "Parâmetros inválidos para o método." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9753,111 +9659,116 @@ msgstr "Parâmetros inválidos para o método." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10068,7 +9979,7 @@ msgstr[1] "Itens activados" msgid "Item in \"not supported\" state" msgstr "O item está como \"não suportado\"" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Item não seleccionado" @@ -10247,7 +10158,7 @@ msgstr "Itens actualizados" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10440,7 +10351,7 @@ msgstr "Localização da etiqueta" msgid "Language" msgstr "Língua" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11041,7 +10952,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11283,7 +11194,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "O período máximo a ser exibido é de %1$s dia." msgstr[1] "O período máximo a ser exibido é de %1$s dias." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11308,7 +11219,7 @@ msgstr "Média" msgid "Media type" msgstr "Tipo de média" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "O tipo de mídia \"%1$s\" já existe." @@ -11352,7 +11263,7 @@ msgstr "" msgid "Media type updated" msgstr "Tipo de média actualizado" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "O tipo de mídia com o ID \"%1$s\" não está disponível." @@ -11364,7 +11275,7 @@ msgstr "O tipo de mídia com o ID \"%1$s\" não está disponível." msgid "Media types" msgstr "Tipos de média" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11611,7 +11522,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12013,15 +11924,17 @@ msgstr "Novo dashboard" msgid "New element" msgstr "Novo elemento" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "Novo evento no grupo de hosts" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Novo valor para a etiqueta de eventos" @@ -12041,7 +11954,7 @@ msgstr "" msgid "New service time" msgstr "Novo horário de serviço" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12068,7 +11981,7 @@ msgstr "Próximo passo" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12097,30 +12010,6 @@ msgstr "Próximo passo" msgid "No" msgstr "Não" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "Não foi encontrado \"%1$s\" para o correlacionamento \"%2$s\"." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "Não foi encontrado \"%1$s\" para o correlacionamento." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12170,11 +12059,6 @@ msgstr "Não foi definido um nome de utilizador para autenticação." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "Sem tipo de condição para o correlacionamento \"%1$s\"." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12313,17 +12197,46 @@ msgstr "Nenhuma correspondência encontrada" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "Sem tipo de operação para o correlacionamento \"%1$s\"." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Sem permissões para acesso ao sistema." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12359,10 +12272,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12390,13 +12302,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12416,8 +12333,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12440,24 +12357,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12479,16 +12396,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12544,7 +12461,7 @@ msgstr "Não existem triggers definidos." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Marcadores não booleanos serão descontinuados." @@ -12614,15 +12531,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Não é possível definir uma senha para o utilizador \"guest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12956,15 +12873,16 @@ msgstr "Inactivo" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Valor antigo da etiqueta de evento" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12986,10 +12904,6 @@ msgstr "Uma vez" msgid "One" msgstr "Um" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Um dos objetos está sem um grupo de hosts." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Apenas uma vez" @@ -12999,10 +12913,6 @@ msgstr "Apenas uma vez" msgid "One-time downtime" msgstr "Downtime único" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Apenas os Super Admins podem criar grupos de hosts." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Apenas através de verificações com o agente Zabbix, SNMPv1, SNMPv2 e SNMPv3 pode ser feita a verificação de unicidade." @@ -13051,10 +12961,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Apenas super administradores podem criar correlacionamentos." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "Apenas super administradores podem definir o proprietário do dashboard." @@ -13063,10 +12969,6 @@ msgstr "Apenas super administradores podem definir o proprietário do dashboard. msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Apenas super administradores podem atualizar correlacionamentos." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Apenas são contabilizados triggers associados a hosts activos e que dependam de items activos" @@ -13115,7 +13017,7 @@ msgstr "A operação não tem nenhum template para operar." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13124,33 +13026,33 @@ msgstr "" msgid "Operations" msgstr "Operações" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operador" @@ -13559,16 +13461,16 @@ msgstr "" msgid "Parameter" msgstr "Parâmetro" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "O parâmetro \"%1$s\" será descontinuado." @@ -13705,7 +13607,7 @@ msgstr "" msgid "Paste without external links" msgstr "Colar sem os links externos" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13751,7 +13653,7 @@ msgstr "Executa uma consulta DNS. Retorna: texto com o tipo de informação requ #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13884,7 +13786,7 @@ msgstr "Preenche o campo inventário do host" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14204,7 +14106,7 @@ msgstr "Proxies" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14212,7 +14114,7 @@ msgstr "Proxies" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14222,12 +14124,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "O proxy \"%1$s\" para o host \"%2$s\" não existe." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "O proxy \"%1$s\" está a ser utilizado pela regra de descoberta \"%2$s\"." @@ -14502,7 +14404,7 @@ msgstr "" msgid "Regular expression" msgstr "Expressão regular" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14762,7 +14664,7 @@ msgid "Replace dependencies" msgstr "Substituir dependências" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14959,7 +14861,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Resultado" @@ -15200,7 +15102,7 @@ msgstr "Porta do servidor SMTP" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15498,7 +15400,7 @@ msgstr "" msgid "Script" msgstr "Script" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "O scritp \"%1$s\" já existe." @@ -15612,7 +15514,7 @@ msgid "Security name" msgstr "Nome de segurança" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15827,11 +15729,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "A hora de início do serviço tem de ser inferior à hora de fim." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15843,7 +15745,7 @@ msgstr "" msgid "Service times" msgstr "Tempos do serviço" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Tipo de serviço" @@ -15856,7 +15758,7 @@ msgstr "" msgid "Service updated" msgstr "Serviço actualizado" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15868,7 +15770,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15886,9 +15788,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "A sessão foi terminada, por favor, inicie a sessão novamente." @@ -15950,7 +15852,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16795,10 +16697,10 @@ msgstr "A tabela \"%1$s\" não tem nenhum campo com nome \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Etiqueta" @@ -16935,7 +16837,7 @@ msgstr "Template" msgid "Template \"%1$s\" already exists." msgstr "O template \"%1$s\" já existe." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17019,7 +16921,7 @@ msgstr "Já existe template com o nome visível \"%1$s\"." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17316,7 +17218,7 @@ msgstr "Até" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17723,7 +17625,7 @@ msgstr "Trigger actualizado" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17787,9 +17689,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17799,7 +17701,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17851,7 +17753,7 @@ msgstr "Tipo de informação" msgid "Types" msgstr "Tipos" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17922,8 +17824,8 @@ msgstr "A URL deverá possuir os campos \"name\" e \"url\" no mapa \"%1$s\"." msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18033,21 +17935,23 @@ msgstr "Unidades" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Desconhecido" @@ -18065,7 +17969,7 @@ msgid "Unknown error" msgstr "Erro desconhecido" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Item do host desconhecido, não existe esse item no host seleccionado" @@ -18204,7 +18108,7 @@ msgstr "Ligado" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18338,37 +18242,37 @@ msgstr "Utilizado nas acções" msgid "User" msgstr "Utilizador" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "O utilizador \"%1$s\" não pode ficar sem grupo." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "O utilizador \"%1$s\" é o proprietário do dashboad \"%2$s\"." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "O utilizador \"%1$s\" é o proprietário do mapa \"%2$s\"." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "O utilizador \"%1$s\" é utilizado na acção \"%2$s\"." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18390,13 +18294,13 @@ msgstr "Utilizador adicionado" msgid "User agent string" msgstr "Mensagem do agente de utilizador" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Um utilizador não pode adicionar-se a si próprio a um grupo desactivado ou a um grupo com acesso à GUI desactivado." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18420,27 +18324,27 @@ msgstr[1] "" msgid "User group" msgstr "Grupo de utilizadores" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "O grupo \"%1$s\" já existe." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "O grupo de utilizadores \"%1$s\" é utilizado na acção \"%2$s\"." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "O grupo de utilizadores \"%1$s\" está configurado para alerta de quedas de base de dados." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "O grupo de utilizadores \"%1$s\" está a ser utilizado no script \"%2$s\"." @@ -18474,9 +18378,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "O grupo de utilizadores com o ID \"%1$s\" não está disponível." @@ -18491,7 +18395,7 @@ msgstr "O grupo de utilizadores com o ID \"%1$s\" não está disponível." msgid "User groups" msgstr "Grupos de utilizadores" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Um utilizador não pode eliminar-se a si próprio." @@ -18526,7 +18430,7 @@ msgstr "Perfil do utilizador" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18545,7 +18449,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18595,12 +18499,12 @@ msgstr "Utilizador actualizado" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "O utilizador com o ID \"%1$s\" não está disponível." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18911,14 +18815,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19030,11 +18934,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Valor de um contador de performance do Windows. Retorna: inteiro, número fracionário ou texto (dependendo da requisição)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19571,7 +19476,7 @@ msgstr "Anualmente" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19628,7 +19533,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19761,11 +19665,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "é esperado um valor booleano" @@ -19773,16 +19677,16 @@ msgstr "é esperado um valor booleano" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "um texto é esperado" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19791,37 +19695,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "é esperado um valor numérico" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "número muito grande" @@ -19842,7 +19746,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19850,19 +19754,19 @@ msgstr "" msgid "a time is expected" msgstr "um horário é esperado" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "é esperado um período de tempo" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19912,7 +19816,7 @@ msgstr "tudo" msgid "all media" msgstr "todas as mídias" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19934,23 +19838,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "é esperado um array" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "é esperado um array ou sequência de caracteres" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19960,7 +19864,7 @@ msgid "an empty string is expected" msgstr "é esperado um texto vazio" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "é esperado um par de caracteres hexadecimais" @@ -19968,11 +19872,15 @@ msgstr "é esperado um par de caracteres hexadecimais" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20133,13 +20041,7 @@ msgstr "não pode ser modificado" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20170,13 +20072,13 @@ msgstr "não pode ser modificado" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20194,14 +20096,14 @@ msgstr "não pode ser modificado" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20274,7 +20176,8 @@ msgid "configure" msgstr "configurar" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20365,7 +20268,7 @@ msgstr "descedente" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20387,13 +20290,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20419,7 +20322,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20456,7 +20360,7 @@ msgstr "a expressão está vazia" msgid "failed to parse JSON" msgstr "falha ao analisar o JSON" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20547,7 +20451,7 @@ msgstr "ícone" msgid "image" msgstr "imagem" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20592,15 +20496,19 @@ msgstr "contagem de elementos incorrecta" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "sintaxe incorrecta próximo de \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20629,7 +20537,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "intervalo de endereços inválido \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "sequência de bytes inválida no UTF-8" @@ -20658,27 +20566,27 @@ msgstr "" msgid "invalid history storage period" msgstr "período inválido para a armazenamento de histórico" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "expressão regular inválida" @@ -20706,7 +20614,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "não está entre {} ou está mal formado" @@ -20856,7 +20764,7 @@ msgstr "correspondências" msgid "max" msgstr "máx" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20896,7 +20804,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "o tamanho mínimo é %1$s caracteres" @@ -20923,8 +20831,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20945,8 +20853,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21162,6 +21070,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21207,11 +21119,11 @@ msgstr "" msgid "regular expression" msgstr "expressão regular" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21223,15 +21135,15 @@ msgstr "" msgid "right" msgstr "direita" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21279,7 +21191,7 @@ msgstr "" msgid "short description" msgstr "descrição sumária" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21298,15 +21210,15 @@ msgstr "descrição sumária" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "deve estar vazio" @@ -21322,31 +21234,31 @@ msgstr "mostrar mapeamento de ícones" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21354,15 +21266,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21375,7 +21287,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21386,7 +21298,7 @@ msgstr "" msgid "tag" msgstr "etiqueta" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21395,14 +21307,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "o ID de template \"%1$s\" é passado %2$s vezes" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21414,20 +21326,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "o parâmetro \"%1$s\" está ausente" @@ -21459,7 +21371,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21467,31 +21379,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21505,7 +21417,7 @@ msgstr "trigger" msgid "trigger does not allow manual closing" msgstr "o trigger não permite encerramento manual" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21517,11 +21429,11 @@ msgstr "um protótipo de trigger não pode ser movido para outro template ou hos msgid "trigger with linkages cannot be moved to another template or host" msgstr "um trigger com associações não pode ser movido para outro template ou host" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21530,7 +21442,7 @@ msgstr "" msgid "type here to search" msgstr "digite aqui para pesquisar" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21578,11 +21490,12 @@ msgstr "fim inesperado da macro" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "parâmetro não esperado: %1$s" @@ -21608,8 +21521,8 @@ msgstr "texto inesperado \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21634,6 +21547,10 @@ msgstr "" msgid "unsupported version number" msgstr "número de versão não suportado" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21691,61 +21608,69 @@ msgstr "o valor \"%1$s\" não foi encontrado" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "o valor %1$s já existe" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "o valor é muito grande" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21776,15 +21701,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "o valor precisa ser um de %1$s" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21793,7 +21716,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21806,11 +21729,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/ro/LC_MESSAGES/frontend.po b/ui/locale/ro/LC_MESSAGES/frontend.po index 603d0f927ec..8dd4495ae3c 100644 --- a/ui/locale/ro/LC_MESSAGES/frontend.po +++ b/ui/locale/ro/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2013-09-08 17:57+0300\n" "Last-Translator: altmir <rmircea@birotec.ro>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -520,7 +520,7 @@ msgstr "Confirmare" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Confirmat" @@ -619,7 +619,7 @@ msgstr "Acțiunea \"%1$s\" există deja." msgid "Action \"%1$s\" no operations defined." msgstr "Acțiunea \"%1$s\" nu are operațiuni definite." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -747,7 +747,7 @@ msgstr "Activ până la" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -758,7 +758,7 @@ msgstr "Activ până la" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -1014,7 +1014,7 @@ msgstr "Vechime mai mică decât" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1336,7 +1336,7 @@ msgstr "La (oră:minut)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1345,8 +1345,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1357,6 +1357,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1368,7 +1373,7 @@ msgstr "Cel puțin o perioadă de mentenanță trebuie creată." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1454,7 +1459,7 @@ msgstr "Autentificare" msgid "Authentication algorithm" msgstr "Algoritm de autentificare" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1503,7 +1508,7 @@ msgstr "" msgid "Auto-login" msgstr "Auto-login" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1514,7 +1519,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1773,7 +1778,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1808,7 +1813,7 @@ msgstr "Apelare inversă" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -2015,7 +2020,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2141,7 +2146,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Nu se poate șterge utilizatorul intern Zabbix \"%1$s\", încercați să dezactivați acest utilizator." @@ -2150,7 +2155,7 @@ msgstr "Nu se poate șterge utilizatorul intern Zabbix \"%1$s\", încercați să msgid "Cannot delete action" msgstr "Nu se poate șterge acțiunea" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2223,7 +2228,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2300,7 +2305,7 @@ msgstr[0] "Nu se poate șterge proxy-ul" msgstr[1] "Nu se poate șterge proxy-ul" msgstr[2] "Nu se poate șterge proxy-ul" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2327,7 +2332,7 @@ msgstr[0] "Nu se poate șterge scriptul" msgstr[1] "Nu se poate șterge scriptul" msgstr[2] "Nu se poate șterge scriptul" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Nu se pot șterge scripturile. Scriptul \"%1$s\" este folosit in acțiunea \"%2$s\"." @@ -2747,16 +2752,16 @@ msgstr "Nu se poate gasi harta valorilor \"%1$s\" folosită pentru prototipul it msgid "Cannot have empty visible template name." msgstr "" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2770,7 +2775,7 @@ msgstr[0] "Nu se poate importa template-ul \"%1$s\", șablonul corelat \"%2$s\" msgstr[1] "Nu se poate importa template-ul \"%1$s\", șabloanele corelate \"%2$s\" nu există." msgstr[2] "Nu se poate importa template-ul \"%1$s\", șabloanele corelate \"%2$s\" nu există." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Nu se poate introduce expresia trigger" @@ -2792,7 +2797,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2854,7 +2859,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Nu se poate citi răspunsul, verificați conexiunea cu serverul Zabbix \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Nu se poate redenumi utilizatorul guest." @@ -2938,7 +2943,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Nu se pot deconecta și șterge scenariile Web." @@ -2951,7 +2956,7 @@ msgstr "Nu se poate deconecta șablonul" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -3013,9 +3018,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Nu se poate actualiza un grafic bazat pe detecție." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Nu se poate actualiza un grup de servere bazat pe detecție." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3075,9 +3081,7 @@ msgstr "Nu se poate actualiza prototipul grafic" msgid "Cannot update group" msgstr "Nu se poate actualiza grupul" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Nu se pot actualiza grupurile pentru serverul detectat \"%1$s\"." @@ -3164,12 +3168,12 @@ msgstr "Nu se poate actualiza harta rețea" msgid "Cannot update proxy" msgstr "Nu se poate actualiza proxy-ul" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Nu se poate actualiza proxy-ul pentru serverul detectat \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3189,9 +3193,9 @@ msgstr "" msgid "Cannot update script" msgstr "Nu se poate actualiza scriptul" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3377,8 +3381,8 @@ msgid "Character string not included" msgstr "Șir de caractere neinclus" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3554,7 +3558,7 @@ msgstr "Ceas" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3592,13 +3596,13 @@ msgstr "Închide" msgid "Close expression constructor" msgstr "Închide constructorul de expresii" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3695,7 +3699,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3706,11 +3710,6 @@ msgstr "Condiție" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3726,11 +3725,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3922,7 +3916,7 @@ msgstr "Text de confirmare" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4124,12 +4118,11 @@ msgstr "Copiază" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4159,16 +4152,6 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4179,8 +4162,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Număr" @@ -4552,7 +4535,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "Nume DNS" @@ -4828,8 +4811,8 @@ msgstr "Dec" msgid "December" msgstr "Decembrie" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4839,7 +4822,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4936,7 +4919,7 @@ msgstr "Întârziat de către" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4986,7 +4969,7 @@ msgstr "Ștergere si curățare șablon? (Avertizare: toate serverele conectate msgid "Delete current action?" msgstr "Ștergere acțiune curentă?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5284,7 +5267,7 @@ msgstr "" msgid "Dependencies" msgstr "Dependențe" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Dependenţă" @@ -5292,7 +5275,7 @@ msgstr "Dependenţă" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5501,10 +5484,10 @@ msgstr "" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5587,7 +5570,7 @@ msgid "Discovery by proxy" msgstr "Detectat de către proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Verificare de detectare" @@ -5599,7 +5582,7 @@ msgstr "Verificări de detectare" msgid "Discovery list" msgstr "Listă de detecție" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Obiect detectat" @@ -5702,7 +5685,7 @@ msgstr "Regulă de detecție actualizată" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5713,7 +5696,7 @@ msgstr "Reguli de detecție" msgid "Discovery rules deleted" msgstr "Reguli de detecție șterse" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Stare detecție" @@ -5869,18 +5852,6 @@ msgstr "" msgid "Draw style" msgstr "Stil de desen" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5893,11 +5864,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -6057,10 +6023,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6087,11 +6049,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6276,7 +6236,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6287,7 +6247,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6330,7 +6290,7 @@ msgid "English (en_US)" msgstr "Engleză (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6406,7 +6366,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6441,11 +6401,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Tip eveniment" @@ -6782,7 +6742,6 @@ msgstr "Câmpul \"%1$s\" nu poate fi pus NULL." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7150,7 +7109,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Expresia dată nu este macro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7396,12 +7355,12 @@ msgstr "Grilă" msgid "Group" msgstr "Grup" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Grupul \"%1$s\" nu poate fi șters, pentru că este utilizat de un server prototip " -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7737,7 +7696,7 @@ msgstr[2] "Server" msgid "Host \"%1$s\" already exists." msgstr "Serverul \"%1$s\" există deja." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7745,7 +7704,7 @@ msgstr "Serverul \"%1$s\" există deja." msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7818,17 +7777,17 @@ msgstr[2] "Servere activate" msgid "Host group" msgstr "Grup server" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Grupul server \"%1$s\" există deja." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Grupul server \"%1$s\" nu poate fi șters, pentru că este utilizat într-un script global." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7842,9 +7801,9 @@ msgid "Host group label type" msgstr "Tipul etichetei grupului de servere" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7860,8 +7819,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -8050,7 +8009,7 @@ msgstr "Server cu același nume vizibil \"%1$s\" există deja." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8138,7 +8097,7 @@ msgstr "IP Internet Protocol" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "Adresă IP" @@ -8163,7 +8122,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8220,12 +8179,12 @@ msgstr "Iconiță selectată" msgid "Icon map" msgstr "Icon hartă" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Icon hartă \"%1$s\" nu poate fi ștearsă. Este folosită în harta \"%2$s\"." @@ -8249,7 +8208,7 @@ msgstr "Icon hartă actualizat" msgid "Icon mapping" msgstr "mapare icon" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8482,7 +8441,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8495,11 +8454,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8711,24 +8670,6 @@ msgstr "Operațiune de acțiune incorectă grup server. Grupul server nu există msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Utilizator acțiune incorectă a operațiunii. Utilizatorul nu există sau nu ai acces la acest utilizator." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8813,20 +8754,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8891,11 +8823,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -9003,7 +8930,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -9117,11 +9044,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9143,10 +9065,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9208,18 +9130,6 @@ msgstr "Valoare incorectă \"%1$s\" pentru câmpul int \"%2$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Valoare incorectă \"%1$s\" pentru câmpul int nesemnat \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9281,12 +9191,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9398,7 +9302,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9409,9 +9313,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9562,7 +9466,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Inserează" @@ -9690,7 +9594,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Interval" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9713,7 +9617,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9727,7 +9631,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9774,9 +9678,11 @@ msgstr "Parametrii metodei invalizi. " #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9816,17 +9722,17 @@ msgstr "Parametrii metodei invalizi. " #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9834,14 +9740,14 @@ msgstr "Parametrii metodei invalizi. " #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9849,111 +9755,116 @@ msgstr "Parametrii metodei invalizi. " #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10167,7 +10078,7 @@ msgstr[2] "Itemi activați" msgid "Item in \"not supported\" state" msgstr "Item în stare \"nesuportată\"" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Item neselectat" @@ -10348,7 +10259,7 @@ msgstr "Itemi actualizați" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10541,7 +10452,7 @@ msgstr "Locație etichetă" msgid "Language" msgstr "Limbă" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11148,7 +11059,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11391,7 +11302,7 @@ msgstr[0] "Perioada maximă de timp pentru afișare este %1$s zile." msgstr[1] "Perioada maximă de timp pentru afișare este %1$s zile." msgstr[2] "Perioada maximă de timp pentru afișare este %1$s zile." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11416,7 +11327,7 @@ msgstr "Media" msgid "Media type" msgstr "Tipul media" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11464,7 +11375,7 @@ msgstr "" msgid "Media type updated" msgstr "Tipul media actualizat" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11476,7 +11387,7 @@ msgstr "" msgid "Media types" msgstr "Tipuri media" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11728,7 +11639,7 @@ msgstr[2] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12130,15 +12041,17 @@ msgstr "" msgid "New element" msgstr "Element nou" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12158,7 +12071,7 @@ msgstr "" msgid "New service time" msgstr "Timp service nou" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12185,7 +12098,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12214,30 +12127,6 @@ msgstr "" msgid "No" msgstr "Nu" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12287,11 +12176,6 @@ msgstr "Niciun nume de utilizator specificat." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12430,17 +12314,46 @@ msgstr "Nicio potrivire găsită" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Nicio permisiune de acces la sistem." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12476,10 +12389,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12507,13 +12419,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12533,8 +12450,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12557,24 +12474,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12596,16 +12513,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12661,7 +12578,7 @@ msgstr "Niciun trigger definit." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12731,15 +12648,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Nu este permisă setarea parolei pentru utilizatorul \"guest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -13073,15 +12990,16 @@ msgstr "Oprit" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -13103,10 +13021,6 @@ msgstr "Odată" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Unul dintre obiecte este lăsat fără grup servere." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "O singură dată" @@ -13116,10 +13030,6 @@ msgstr "O singură dată" msgid "One-time downtime" msgstr "Întrerupere unică" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Numai super administratorii pot crea grupuri de servere." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -13169,10 +13079,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13181,10 +13087,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Numai triggerii atribuiți să activeze servere și care depind de itemi activați sunt contorizați" @@ -13233,7 +13135,7 @@ msgstr "Operațiunea nu are șablon de operare." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13242,33 +13144,33 @@ msgstr "" msgid "Operations" msgstr "Operațiuni" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operator" @@ -13677,16 +13579,16 @@ msgstr "" msgid "Parameter" msgstr "Parametru" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13823,7 +13725,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13869,7 +13771,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -14002,7 +13904,7 @@ msgstr "Populare câmp server inventar" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14322,7 +14224,7 @@ msgstr "Proxy-uri" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14330,7 +14232,7 @@ msgstr "Proxy-uri" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14340,12 +14242,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Proxy \"%1$s\" pentru serverul \"%2$s\" nu există." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Proxy \"%1$s\" este utilizat de regula de detecție \"%2$s\"." @@ -14622,7 +14524,7 @@ msgstr "" msgid "Regular expression" msgstr "Expresie uzuală" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14883,7 +14785,7 @@ msgid "Replace dependencies" msgstr "Înlocuiește dependențele" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -15080,7 +14982,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Rezultat" @@ -15321,7 +15223,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15622,7 +15524,7 @@ msgstr "" msgid "Script" msgstr "Script" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Scriptul \"%1$s\" există deja." @@ -15738,7 +15640,7 @@ msgid "Security name" msgstr "Nume securitate" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15954,11 +15856,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Timpul de pornire al serviciului trebuie sa fie mai puțin decât serviciul de sfârșit." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15970,7 +15872,7 @@ msgstr "" msgid "Service times" msgstr "Timpuri de serviciu" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Tip de serviciu" @@ -15983,7 +15885,7 @@ msgstr "" msgid "Service updated" msgstr "Serviciu actualizat" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15995,7 +15897,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -16013,9 +15915,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Sesiune terminată, relogare, va rog." @@ -16077,7 +15979,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16922,10 +16824,10 @@ msgstr "Tabelul \"%1$s\" nu are un câmp numit \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Etichetă" @@ -17062,7 +16964,7 @@ msgstr "Șablon" msgid "Template \"%1$s\" already exists." msgstr "Șablonul \"%1$s\" există deja." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17146,7 +17048,7 @@ msgstr "Șablon cu același nume vizibil \"%1$s\" există deja." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17445,7 +17347,7 @@ msgstr "Până când" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17857,7 +17759,7 @@ msgstr "Trigger actualizat" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17921,9 +17823,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17933,7 +17835,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17985,7 +17887,7 @@ msgstr "Tip de informație" msgid "Types" msgstr "Tipuri" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -18056,8 +17958,8 @@ msgstr "" msgid "URLs" msgstr "URL-uri" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18167,21 +18069,23 @@ msgstr "Unități" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Necunoscut" @@ -18199,7 +18103,7 @@ msgid "Unknown error" msgstr "Eroare necunoscută" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Item server necunoscut, nu există asemenea item în serverul selectat" @@ -18339,7 +18243,7 @@ msgstr "Sus" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18473,37 +18377,37 @@ msgstr "Utilizat în acțiuni" msgid "User" msgstr "Utilizator" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18525,13 +18429,13 @@ msgstr "Utilizator adăugat" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Utilizatorul nu poate să se adauge unui grup dezactivat sau unui grup cu acces GUI dezactivat." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18556,27 +18460,27 @@ msgstr[2] "" msgid "User group" msgstr "Grup utilizator" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Grup utilizator \"%1$s\" este utilizat în configurația pentru mesaje de cădere a bazei de date." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Grup utilizator \"%1$s\" folosit în script \"%2$s\"." @@ -18612,9 +18516,9 @@ msgstr[2] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18629,7 +18533,7 @@ msgstr "" msgid "User groups" msgstr "Grupuri utilizator" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Utilizatorului nu îi este permis să se șteargă." @@ -18664,7 +18568,7 @@ msgstr "Profil utilizator" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18684,7 +18588,7 @@ msgstr[2] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18735,12 +18639,12 @@ msgstr "Utilizator actualizat" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -19051,14 +18955,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19170,11 +19074,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19713,7 +19618,7 @@ msgstr "Anual" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19770,7 +19675,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19903,11 +19807,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19915,16 +19819,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19933,37 +19837,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19984,7 +19888,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19992,19 +19896,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -20054,7 +19958,7 @@ msgstr "toți" msgid "all media" msgstr "toata media" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -20076,23 +19980,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -20102,7 +20006,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -20110,11 +20014,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20275,13 +20183,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20312,13 +20214,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20336,14 +20238,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20416,7 +20318,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20507,7 +20410,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20529,13 +20432,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20561,7 +20464,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20598,7 +20502,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20689,7 +20593,7 @@ msgstr "iconiță" msgid "image" msgstr "imagine" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20734,15 +20638,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "sintaxă incorectă lângă \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20770,7 +20678,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20799,27 +20707,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20847,7 +20755,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20997,7 +20905,7 @@ msgstr "" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -21037,7 +20945,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -21064,8 +20972,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -21086,8 +20994,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21303,6 +21211,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21348,11 +21260,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21364,15 +21276,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21420,7 +21332,7 @@ msgstr "" msgid "short description" msgstr "descriere scurtă" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21439,15 +21351,15 @@ msgstr "descriere scurtă" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21463,31 +21375,31 @@ msgstr "arată mapări iconițe" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21495,15 +21407,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21516,7 +21428,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21527,7 +21439,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21536,14 +21448,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "ID șablon \"%1$s\" este trecut %2$s ori" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21555,20 +21467,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21600,7 +21512,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21608,31 +21520,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21646,7 +21558,7 @@ msgstr "trigger" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21658,11 +21570,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21671,7 +21583,7 @@ msgstr "" msgid "type here to search" msgstr "scrie aici pentru căutare" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21719,11 +21631,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21749,8 +21662,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21775,6 +21688,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21832,61 +21749,71 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21917,15 +21844,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21934,7 +21859,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21947,11 +21872,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/ru/LC_MESSAGES/frontend.po b/ui/locale/ru/LC_MESSAGES/frontend.po index 5f4ba61c1f4..91c48f5db7c 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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2021-09-20 09:03+0300\n" "Last-Translator: Yurii <jurijs.klopovskis@zabbix.com>\n" "Language-Team: Zabbix translation team\n" @@ -520,7 +520,7 @@ msgstr "Подтвердить" msgid "Acknowledge problems" msgstr "Подтверждение проблем" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Подтверждено" @@ -619,7 +619,7 @@ msgstr "Действие \"%1$s\" уже существует." msgid "Action \"%1$s\" no operations defined." msgstr "В действии \"%1$s\" нет заданных операций." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -747,7 +747,7 @@ msgstr "Активно до" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -758,7 +758,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -1014,7 +1014,7 @@ msgstr "Возраст менее чем" msgid "Age less than %1$s" msgstr "Возраст меньше чем %1$s" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1340,7 +1340,7 @@ msgstr "В (час:минута)" msgid "At least one UI element must be checked." msgstr "Необходимо выбрать по крайней мере один элемент интерфейса пользователей." -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1349,8 +1349,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "По крайней мере одно действие обязательно." -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "Должен существовать, по крайней мере, один активный пользователь с ролью \"%1$s\"." @@ -1361,6 +1361,11 @@ msgstr "Должен существовать, по крайней мере, о msgid "At least one host group or host must be selected." msgstr "Должна быть выбрана по крайней мере одна группа узлов сети или узел сети." +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1372,7 +1377,7 @@ msgstr "Должен быть создан по крайней мере один msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "Должна поддерживаться по крайней мере одна база данных из MySQL, PostgreSQL или Oracle." -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "Должна быть выбрана по крайней мере одна операция." @@ -1458,7 +1463,7 @@ msgstr "Аутентификация" msgid "Authentication algorithm" msgstr "Алгоритм аутентификации" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "Ошибка при аутентификации: %1$s." @@ -1507,7 +1512,7 @@ msgstr "Авто" msgid "Auto-login" msgstr "Авто-вход" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Опции авто-вход и авто-выход нельзя активировать вместе." @@ -1518,7 +1523,7 @@ msgstr "Авто-выход" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1777,7 +1782,7 @@ msgstr "CRLF" msgid "CSV to JSON" msgstr "CSV в JSON" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1812,7 +1817,7 @@ msgstr "Callback" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -2019,7 +2024,7 @@ msgstr "Не удалось привязать к LDAP серверу." msgid "Cannot build expression tree: %1$s." msgstr "Не удалось построить дерево выражения: %1$s." -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2145,7 +2150,7 @@ msgstr[0] "Не удалось удалить API токен" msgstr[1] "Не удалось удалить API токены" msgstr[2] "Не удалось удалить API токены" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Невозможно удалить внутреннего пользователя Zabbix \"%1$s\", попробуйте отключить его." @@ -2154,7 +2159,7 @@ msgstr "Невозможно удалить внутреннего пользо msgid "Cannot delete action" msgstr "Не удалось удалить действие" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2225,7 +2230,7 @@ msgstr[0] "Не удалось удалить узел сети так как о msgstr[1] "Не удалось удалить выбранные узлы сети так как обслуживание \"%1$s\" должно содержать по крайней мере один узел сети или группу узлов сети." msgstr[2] "Не удалось удалить выбранные узлы сети так как обслуживание \"%1$s\" должно содержать по крайней мере один узел сети или группу узлов сети." -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2300,7 +2305,7 @@ msgstr[0] "Не удалось удалить прокси" msgstr[1] "Не удалось удалить прокси" msgstr[2] "Не удалось удалить прокси" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "Не удалось удалить роль пользователя \"%1$s\" только для чтения." @@ -2326,7 +2331,7 @@ msgstr[0] "Не удалось удалить скрипт" msgstr[1] "Не удалось удалить скрипты" msgstr[2] "Не удалось удалить скрипты" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Не удалось удалить скрипты. Скрипт \"%1$s\" используется в операции действия \"%2$s\"." @@ -2746,16 +2751,16 @@ msgstr "Не удалось найти преобразование значен msgid "Cannot have empty visible template name." msgstr "Видимое имя шаблона не может быть пустым." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2769,7 +2774,7 @@ msgstr[0] "Не удалось импортировать шаблон \"%1$s\", msgstr[1] "Не удалось импортировать шаблон \"%1$s\", соединенные шаблоны \"%2$s\" не существуют." msgstr[2] "Не удалось импортировать шаблон \"%1$s\", соединенные шаблоны \"%2$s\" не существуют." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Не удалось вставить выражение триггера" @@ -2791,7 +2796,7 @@ msgstr[0] "Не удалось загрузить модуль с: %1$s." msgstr[1] "Не удалось загрузить модули с: %1$s." msgstr[2] "Не удалось загрузить модули с: %1$s." -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2853,7 +2858,7 @@ msgstr "Не удалось прочитать YAML: %1$s." msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Не удалось прочитать ответ, проверьте соединение с Zabbix сервером \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Невозможно переименовать гостевого пользователя." @@ -2937,7 +2942,7 @@ msgstr[0] "Не удалось разблокировать пользовате msgstr[1] "Не удалось разблокировать пользователей" msgstr[2] "Не удалось разблокировать пользователей" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Не удалось отсоединить и очистить веб-сценарии." @@ -2950,7 +2955,7 @@ msgstr "Не удалось отсоединить шаблон" msgid "Cannot unlink template." msgstr "Не удалось отсоединить шаблон." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "Не удалось отсоединить триггер \"%1$s\", у него имеются элементы данных с шаблона, который остается присоединённым к узлу сети." @@ -3012,9 +3017,10 @@ msgstr "Не удалось обновить API токен" msgid "Cannot update a discovered graph." msgstr "Невозможно обновить обнаруженный график." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Невозможно обновить обнаруженную группу узлов сети." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3074,9 +3080,7 @@ msgstr "Не удалось обновить прототип графиков" msgid "Cannot update group" msgstr "Не удалось обновить группу" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Не удалось обновить группы для обнаруженного узла сети \"%1$s\"." @@ -3161,12 +3165,12 @@ msgstr "Не удалось обновить карту сети" msgid "Cannot update proxy" msgstr "Не удалось обновить прокси" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Не удалось обновить прокси для обнаруженного узла сети \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "Не удалось обновить роль пользователя \"%1$s\" только на чтение." @@ -3186,9 +3190,9 @@ msgstr "Не удалось обновить регулярный отчет" msgid "Cannot update script" msgstr "Не удалось обновить скрипт" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "Не удалось обновить область использования скрипта. Скрипт \"%1$s\" используется в действии \"%2$s\"." @@ -3373,8 +3377,8 @@ msgid "Character string not included" msgstr "Строка символов не включена" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "Символы" @@ -3550,7 +3554,7 @@ msgstr "Часы" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3588,13 +3592,13 @@ msgstr "Закрыть" msgid "Close expression constructor" msgstr "Закрыть конструктор выражения" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Закрыть новое событие" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Закрыть старые события" @@ -3691,7 +3695,7 @@ msgstr "Сжатие" msgid "Concurrent sessions" msgstr "Одновременные сессии" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3702,11 +3706,6 @@ msgstr "Условие" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "Условие \"%2$s\" не используется в формуле \"%3$s\" действия \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "Условие \"%2$s\" не используется в формуле \"%3$s\" для корреляции \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3722,11 +3721,6 @@ msgstr "Условие \"%2$s\" не используется в \"%3$s\" фор msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" действия \"%1$s\" не определено." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" для корреляции \"%1$s\" не определено." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3918,7 +3912,7 @@ msgstr "Текст подтверждения" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Поздравляем! Вы успешно установили Zabbix веб-интерфейс." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4131,12 +4125,11 @@ msgstr "Копировать" msgid "Copy to clipboard" msgstr "Копировать в буфер обмена" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Корреляция" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "Корреляция \"%1$s\" уже существует." @@ -4166,16 +4159,6 @@ msgstr[0] "Корреляция активирована" msgstr[1] "Корреляции активированы" msgstr[2] "Корреляций активированы" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "У корреляции отсутствуют параметры: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "Имя корреляции не может быть пустым." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Правило корреляции" @@ -4186,8 +4169,8 @@ msgstr "Корреляция обновлена" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Количество" @@ -4559,7 +4542,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS имя" @@ -4835,8 +4818,8 @@ msgstr "Дек." msgid "December" msgstr "Декабрь" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "Число десятичных знаков" @@ -4846,7 +4829,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4943,7 +4926,7 @@ msgstr "Задерживается на" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4993,7 +4976,7 @@ msgstr "Удалить и очистить шаблон? (Внимание: вс msgid "Delete current action?" msgstr "Удалить текущее действие?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Удалить текущую корреляцию?" @@ -5291,7 +5274,7 @@ msgstr "Список запретов" msgid "Dependencies" msgstr "Зависимости" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Зависимость" @@ -5299,7 +5282,7 @@ msgstr "Зависимость" msgid "Dependent item" msgstr "Зависимый элемент данных" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5508,10 +5491,10 @@ msgstr "Деактивировать выбранные веб-сценарии? #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5594,7 +5577,7 @@ msgid "Discovery by proxy" msgstr "Обнаружение через прокси" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Проверка обнаружения" @@ -5606,7 +5589,7 @@ msgstr "Проверки обнаружения" msgid "Discovery list" msgstr "Список обнаружений" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Объект обнаружения" @@ -5708,7 +5691,7 @@ msgstr "Правило обнаружения обновлено" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5719,7 +5702,7 @@ msgstr "Правила обнаружения" msgid "Discovery rules deleted" msgstr "Правила обнаружения удалены" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Состояние обнаружения" @@ -5875,18 +5858,6 @@ msgstr "Отрисовка" msgid "Draw style" msgstr "Стиль отрисовки" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "Дубликат \"%1$s\" значения \"%2$s\" у корреляции \"%3$s\"." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Дубликат \"%1$s\" значения \"%2$s\" у корреляции." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5899,11 +5870,6 @@ msgstr "Дубликат значения \"имя\" \"%1$s\" у карты се msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -6063,10 +6029,6 @@ msgstr "Пустой файл SSL ключа у веб-сценария \"%1$s\" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "Пустой ID корреляции." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6093,11 +6055,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "Пустой тип условия фильтрации для действия \"%1$s\"." #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6282,7 +6242,7 @@ msgstr "Активировать трапы" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6293,7 +6253,7 @@ msgstr "Активировать трапы" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6336,7 +6296,7 @@ msgid "English (en_US)" msgstr "Английский (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6411,7 +6371,7 @@ msgid "Event correlation" msgstr "Корреляция событий" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Правила корреляции событий" @@ -6446,11 +6406,11 @@ msgstr "Мониторинг журнала событий. Возвращает msgid "Event name" msgstr "Имя события" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Пара тегов событий" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Тип события" @@ -6787,7 +6747,6 @@ msgstr "Поле \"%1$s\" не может быть NULL." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7155,7 +7114,7 @@ msgstr "Получить значение с узла сети" msgid "Given expression is not a macro" msgstr "Заданное выражение не является макросом" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "Глобальное регулярное выражение \"%1$s\" не существует." @@ -7401,12 +7360,12 @@ msgstr "Сетка" msgid "Group" msgstr "Группа" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Группа \"%1$s\" не может быть удалена, так как используется прототипом узлов сети." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "Группа узлов сети \"%1$s\" не может быть удалена, так как она используется в условии корреляции." @@ -7740,7 +7699,7 @@ msgstr[2] "Узлы сети" msgid "Host \"%1$s\" already exists." msgstr "Узел сети \"%1$s\" уже существует." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7748,7 +7707,7 @@ msgstr "Узел сети \"%1$s\" уже существует." msgid "Host \"%1$s\" cannot be without host group." msgstr "Узел сети \"%1$s\" не может быть без группы узлов сети." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7821,17 +7780,17 @@ msgstr[2] "Узлы сети активированы" msgid "Host group" msgstr "Группа узлов сети" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Группа узлов сети \"%1$s\" уже существует." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Группа узлов сети \"%1$s\" не может быть удалена, так как используется в глобальном скрипте." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7845,9 +7804,9 @@ msgid "Host group label type" msgstr "Тип подписи к группе узлов сети" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "Группа узлов сети с ID \"%1$s\" недоступна." @@ -7863,8 +7822,8 @@ msgstr "Группа узлов сети с ID \"%1$s\" недоступна." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -8052,7 +8011,7 @@ msgstr "Узел сети с таким же видимым именем \"%1$s\ #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8140,7 +8099,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP адрес" @@ -8165,7 +8124,7 @@ msgstr "Диапазон IP \"%1$s\" превышает допустимый л #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8222,12 +8181,12 @@ msgstr "Подсветка иконок" msgid "Icon map" msgstr "Соответствие иконок" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "Соответствие иконок \"%1$s\" уже существует." -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Соответствие иконок \"%1$s\" не может быть удалено. Используется в карте сети \"%2$s\"." @@ -8251,7 +8210,7 @@ msgstr "Соответствие иконок обновлено" msgid "Icon mapping" msgstr "Соответствия иконок" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "Иконка с ID \"%1$s\" недоступна." @@ -8484,7 +8443,7 @@ msgstr "Недоступный прототип элементов данных" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8497,11 +8456,11 @@ msgstr "Недоступная карта сети" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "Недоступный шаблон" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "Недоступный триггер" @@ -8713,24 +8672,6 @@ msgstr "Некорректная группа пользователей для msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Некорректный пользователь для операции действия. Пользователь не существует или у вас нет к нему доступа." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8815,20 +8756,11 @@ msgstr "Некорректные условия в действии \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Некорректные условия в правиле обнаружения \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "Некорректный ID корреляции." - #: 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." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "Некорректное пользовательское выражение \"%2$s\" для корреляции \"%1$s\": %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8893,11 +8825,6 @@ msgstr "Некорректный ID формулы условия фильтра msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Некорректный ID формулы условия фильтра для правила обнаружения \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "Задан некорректный ID формулы условия фильтра для корреляции \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -9005,7 +8932,7 @@ msgstr "Некорректный ID карты сети." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Некорректный метод \"%1$s.%2$s\"." @@ -9119,11 +9046,6 @@ msgstr "Некорректное выражение прототипа триг msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Некорректный тип вычисления для действия \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "Некорректный тип вычисления для корреляции \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9145,10 +9067,10 @@ msgstr "Указано некорректное значение ID пользо msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "Указано некорректное значение ID группы пользователей у карты сети \"%1$s\"." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "Некорректные имя пользователя или пароль или аккаунт временно заблокирован." @@ -9210,18 +9132,6 @@ msgstr "Некорректное значение \"%1$s\" для поля це msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Некорректное значение \"%1$s\" для поля целого положительного числа \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "Некорректное значение \"%1$s\" в поле \"%2$s\" у корреляции \"%3$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9283,12 +9193,6 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9400,7 +9304,7 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9411,9 +9315,9 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9564,7 +9468,7 @@ msgstr "Унаследованные и собственные теги" msgid "Inherited items" msgstr "Унаследованные элементы данных" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Вставить" @@ -9692,7 +9596,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Интервал" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9715,7 +9619,7 @@ msgstr "Ошибочное содержимое YAML файла." msgid "Invalid action condition: %1$s." msgstr "Ошибочное условие действия: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "Ошибочное условие: %1$s." @@ -9729,7 +9633,7 @@ msgstr "Ошибочная дата." msgid "Invalid email address \"%1$s\"." msgstr "Ошибочный email адрес \"%1$s\"." -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "Ошибочный email адрес у способа оповещения с ID \"%1$s\"." @@ -9776,9 +9680,11 @@ msgstr "Ошибочные параметры метода." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9818,17 +9724,17 @@ msgstr "Ошибочные параметры метода." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9836,14 +9742,14 @@ msgstr "Ошибочные параметры метода." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9851,111 +9757,116 @@ msgstr "Ошибочные параметры метода." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10169,7 +10080,7 @@ msgstr[2] "Элементы данных активированы" msgid "Item in \"not supported\" state" msgstr "Элемент данных в \"неподдерживаемом\" состоянии" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Элемент данных не выбран" @@ -10349,7 +10260,7 @@ msgstr "Элементы данных обновлены" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10542,7 +10453,7 @@ msgstr "Расположение подписи" msgid "Language" msgstr "Язык" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "Язык \"%1$s\" не поддерживается." @@ -11149,7 +11060,7 @@ msgstr "Управление регулярными отчетами" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11392,7 +11303,7 @@ msgstr[0] "Максимальный период времени отображе msgstr[1] "Максимальный период времени отображения %1$s дня." msgstr[2] "Максимальный период времени отображения %1$s дней." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "Превышена максимальная длина email адреса у способа оповещения с ID \"%1$s\"." @@ -11417,7 +11328,7 @@ msgstr "Оповещения" msgid "Media type" msgstr "Способ оповещений" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Тип медиа \"%1$s\" уже существует." @@ -11464,7 +11375,7 @@ msgstr "Успешное тестирование способа оповеще msgid "Media type updated" msgstr "Способ оповещений обновлен" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "Способ оповещения с ID \"%1$s\" недоступен." @@ -11476,7 +11387,7 @@ msgstr "Способ оповещения с ID \"%1$s\" недоступен." msgid "Media types" msgstr "Способы оповещений" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "Способы оповещения используются действием \"%1$s\"." @@ -11728,7 +11639,7 @@ msgstr[2] "Модулей активировано: %1$s." msgid "Module updated: %1$s." msgstr "Модуль обновлен: %1$s." -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12130,15 +12041,17 @@ msgstr "Новая панель" msgid "New element" msgstr "Новый элемент" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "Группа узлов нового события" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "Имя тега нового события" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Значение тега нового события" @@ -12158,7 +12071,7 @@ msgstr "" msgid "New service time" msgstr "Новый интервал времени услуги" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "Имя нового тега" @@ -12185,7 +12098,7 @@ msgstr "Далее" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12214,30 +12127,6 @@ msgstr "Далее" msgid "No" msgstr "Нет" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "\"%1$s\" не задан для корреляции \"%2$s\"." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "\"%1$s\" не задан для корреляции." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12287,11 +12176,6 @@ msgstr "Для аутентификации не указано имя поль msgid "No changes." msgstr "Без изменений." -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "Для корреляции \"%1$s\" не задан тип условия." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12430,17 +12314,46 @@ msgstr "Совпадения не найдены" msgid "No new modules discovered" msgstr "Новые модули не обнаружены" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "Тип операции не задан для корреляции \"%1$s\"." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Нет прав доступа в систему." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." @@ -12476,10 +12389,9 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12507,13 +12419,18 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12533,8 +12450,8 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12557,24 +12474,24 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12596,16 +12513,16 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12661,7 +12578,7 @@ msgstr "Триггеры не заданы." msgid "No value" msgstr "Значение отсутствует" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Не-логические флаги устарели." @@ -12731,15 +12648,15 @@ msgstr "Отображены не все результаты. Пожалуйс msgid "Not all templates are linked to \"%1$s\"." msgstr "Не все шаблоны присоединены к \"%1$s\"." -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "Нет прав доступа, чтобы задать язык пользователю \"guest\"." -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Не разрешено устанавливать пароль для пользователя \"guest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "Нет прав доступа, чтобы задать тему пользователю \"guest\"." @@ -13073,15 +12990,16 @@ msgstr "Выкл" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "Имя тега старого события" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Значение тега старого события" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "Имя старого тега" @@ -13103,10 +13021,6 @@ msgstr "Один раз" msgid "One" msgstr "Одна" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Один из объектов остался без группы узлов сети." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Единовременно" @@ -13116,10 +13030,6 @@ msgstr "Единовременно" msgid "One-time downtime" msgstr "Однократная недоступность" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Только Супер Администраторы могут создавать группы узлов сети." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Только Zabbix агент, SNMPv1, SNMPv2 и SNMPv3 проверки могут быть сделаны уникальными." @@ -13169,10 +13079,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Только супер администраторы могут создавать корреляции." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "Только супер администраторы могут задавать владельца ПАНЕЛИ." @@ -13181,10 +13087,6 @@ msgstr "Только супер администраторы могут зада msgid "Only super admins can set report owner." msgstr "Только супер администраторы могут задавать владельца отчета." -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Только супер администраторы могут обновлять корреляции." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Подсчитываются только триггеры у активированных узлов сети и которые зависят от активных элементов данных" @@ -13233,7 +13135,7 @@ msgstr "Операция не имеет шаблон для функциони msgid "Operational data" msgstr "Оперативные данные" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13242,33 +13144,33 @@ msgstr "Оперативные данные" msgid "Operations" msgstr "Операции" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Оператор" @@ -13677,16 +13579,16 @@ msgstr "Навигатор" msgid "Parameter" msgstr "Параметр" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Параметр \"%1$s\" устарел." @@ -13823,7 +13725,7 @@ msgstr "Вставить виджет" msgid "Paste without external links" msgstr "Вставить без внешних связей" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "Шаблон" @@ -13869,7 +13771,7 @@ msgstr "Выполнение DNS запроса. Возвращает строк #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -14002,7 +13904,7 @@ msgstr "Заполнение поля инвентаря узла сети" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14322,7 +14224,7 @@ msgstr "Прокси" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14330,7 +14232,7 @@ msgstr "Прокси" msgid "Proxy" msgstr "Прокси" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "Прокси \"%1$s\" уже существует." @@ -14340,12 +14242,12 @@ msgstr "Прокси \"%1$s\" уже существует." msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Прокси \"%1$s\" для узла сети \"%2$s\" не существует." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "Прокси \"%1$s\" используется действием \"%2$s\"." -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Прокси \"%1$s\" используется правилом обнаружения \"%2$s\"." @@ -14621,7 +14523,7 @@ msgstr "Обычные" msgid "Regular expression" msgstr "Регулярное выражение" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "Регулярное выражение \"%1$s\" уже существует." @@ -14882,7 +14784,7 @@ msgid "Replace dependencies" msgstr "Заменить зависимости" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "Замена" @@ -15079,7 +14981,7 @@ msgstr "Тип ответа: Строка" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Результат" @@ -15320,7 +15222,7 @@ msgstr "Порт SMTP сервера" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15621,7 +15523,7 @@ msgstr "Границы" msgid "Script" msgstr "Скрипт" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Скрипт \"%1$s\" уже существует." @@ -15736,7 +15638,7 @@ msgid "Security name" msgstr "Имя безопасности" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15952,11 +15854,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Время начала должно быть меньше чем время окончания." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15968,7 +15870,7 @@ msgstr "" msgid "Service times" msgstr "Интервалы времени услуги" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Тип сервиса" @@ -15981,7 +15883,7 @@ msgstr "" msgid "Service updated" msgstr "Услуга обновлена" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15993,7 +15895,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -16011,9 +15913,9 @@ msgstr "" msgid "Session initialization error." msgstr "Ошибка инициализации сессии." -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Сессия завершена, пожалуйста, зайдите повторно в систему." @@ -16075,7 +15977,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16920,10 +16822,10 @@ msgstr "У таблицы \"%1$s\" нет поля с названием \"%2$s\ #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Этикетка" @@ -17060,7 +16962,7 @@ msgstr "Шаблон" msgid "Template \"%1$s\" already exists." msgstr "Шаблон \"%1$s\" уже существует." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17144,7 +17046,7 @@ msgstr "Шаблон с таким же видимым именем \"%1$s\" у #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17443,7 +17345,7 @@ msgstr "До" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17854,7 +17756,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17918,9 +17820,9 @@ msgstr "Необходимо выбрать два элемента карты" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17930,7 +17832,7 @@ msgstr "Необходимо выбрать два элемента карты" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17982,7 +17884,7 @@ msgstr "Тип информации" msgid "Types" msgstr "Типы" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -18053,8 +17955,8 @@ msgstr "URL должно быть с обоими полями \"name\" и \"url msgid "URLs" msgstr "URLы" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "Ожидается UUIDv4" @@ -18164,21 +18066,23 @@ msgstr "Ед. измерения" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Неизвестно" @@ -18196,7 +18100,7 @@ msgid "Unknown error" msgstr "Неизвестная ошибка" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Неизвестный элемент данных узла сети, такого элемента данных нет у выбранного узла сети" @@ -18336,7 +18240,7 @@ msgstr "Доступен" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18470,37 +18374,37 @@ msgstr "Использование в действиях" msgid "User" msgstr "Пользователь" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "Пользователь \"%1$s\" не может быть без группы пользователей." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "Пользователь \"%1$s\" владелец панели \"%2$s\"." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "Пользователь \"%1$s\" является владельцем \"%2$s\" карты сети." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "Пользователь \"%1$s\" является владельцем \"%2$s\" отчета." -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "Пользователь \"%1$s\" является получателем \"%2$s\" отчета." -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "Пользователь \"%1$s\" используется в \"%2$s\" действии." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "Пользователь \"%1$s\" является пользователем от имени которого создан \"%2$s\" шаблон." @@ -18522,13 +18426,13 @@ msgstr "Пользователь добавлен" msgid "User agent string" msgstr "Строка user agent" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Пользователь не может добавить себя в отключенную группу или в группу с отключенным доступом к Веб-интерфейсу." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "Пользователь не может изменить свою роль." @@ -18553,27 +18457,27 @@ msgstr[2] "Пользователи удалены" msgid "User group" msgstr "Группа пользователей" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Группа пользователей \"%1$s\" уже существует." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "Группа пользователей \"%1$s\" является получателем \"%2$s\" отчета." -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "Группа пользователей \"%1$s\" используется в \"%2$s\" действии." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Группа пользователей \"%1$s\" используется в настройках отправки сообщений о недоступности базы данных." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Группа пользователей \"%1$s\" используется в скрипте \"%2$s\"." @@ -18609,9 +18513,9 @@ msgstr[2] "Группы пользователей обновлены" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "Группа пользователей с ID \"%1$s\" недоступна." @@ -18626,7 +18530,7 @@ msgstr "Группа пользователей с ID \"%1$s\" недоступ msgid "User groups" msgstr "Группы пользователей" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Пользователю не разрешается удалять самого себя." @@ -18661,7 +18565,7 @@ msgstr "Профиль пользователя" msgid "User role" msgstr "Роль пользователя" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18681,7 +18585,7 @@ msgstr[2] "Роли пользователей удалены" msgid "User role updated" msgstr "Роль пользователя обновлена" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "Роль пользователя с ID \"%1$s\" недоступна." @@ -18732,12 +18636,12 @@ msgstr "Пользователь обновлен" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "Пользователь с ID \"%1$s\" недоступен." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "Пользователь с именем пользователя \"%1$s\" уже существует." @@ -19048,14 +18952,14 @@ msgstr "Валидация" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19167,11 +19071,12 @@ msgstr "Значение любого счетчика производител msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Значение любого счетчика производительности Windows. Возвращает целое число, дробное число, строку или текст (в зависимости от запроса)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "Значение тега нового события" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "Значение тега старого события" @@ -19710,7 +19615,7 @@ msgstr "Ежегодно" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19767,7 +19672,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "Вы не указали цели для глобального скрипта \"%1$s\" операции действия." #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19900,11 +19804,11 @@ msgstr "[Ошибочное значение для дня: \"%1$s\" ]" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "[Ошибочное значение для месяца: \"%1$s\" ]" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "ожидается DNS имя" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "ожидается логическое" @@ -19912,16 +19816,16 @@ msgstr "ожидается логическое" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "ожидается строка символов" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "ожидается дата в ГГГГ-ММ-ДД формате" @@ -19930,37 +19834,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "ожидается значение с плавающей точкой" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "ожидается макрос низкоуровневого обнаружения" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "у числа слишком много десятичных точек" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "ожидается число" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "число слишком большое" @@ -19981,7 +19885,7 @@ msgstr "ожидается относительное время" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "ожидается строка, число или отсутствие значения" @@ -19989,19 +19893,19 @@ msgstr "ожидается строка, число или отсутствие msgid "a time is expected" msgstr "ожидается время" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "ожидается период времени" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -20051,7 +19955,7 @@ msgstr "все" msgid "all media" msgstr "все способы оповещения" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "ожидается IP адрес" @@ -20073,23 +19977,23 @@ msgstr "ожидается IP адрес" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "ожидается массив" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "ожидается массив или строка символов" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "ожидается массив или объект" @@ -20099,7 +20003,7 @@ msgid "an empty string is expected" msgstr "ожидается пустая строка" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "ожидается четное количество шестнадцатеричных символов" @@ -20107,11 +20011,15 @@ msgstr "ожидается четное количество шестнадца msgid "an explicit time is expected" msgstr "ожидается время указанное явно" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "ожидается целое число" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "ожидается целое положительное число" @@ -20272,13 +20180,7 @@ msgstr "нельзя изменить" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20309,13 +20211,13 @@ msgstr "нельзя изменить" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20333,14 +20235,14 @@ msgstr "нельзя изменить" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20413,7 +20315,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "содержит" @@ -20504,7 +20407,7 @@ msgstr "по убыванию" msgid "description" msgstr "описание" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "папка не может быть пустой" @@ -20526,13 +20429,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "правило обнаружения \"%1$s\" на узле сети \"%2$s\" не наблюдается" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "не содержит" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "не равно" @@ -20558,7 +20461,8 @@ msgid "e() - Returns Euler's number" 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/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20595,7 +20499,7 @@ msgstr "пустое выражение" msgid "failed to parse JSON" msgstr "ошибка при разборе JSON" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20686,7 +20590,7 @@ msgstr "иконка" msgid "image" msgstr "изображение" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20731,15 +20635,19 @@ msgstr "некорректное количество элементов" msgid "incorrect expression starting from \"%1$s\"" msgstr "некорректное выражение начиная с \"%1$s\"" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "некорректный синтаксис около \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "некорректное использование функции \"%1$s\"" @@ -20767,7 +20675,7 @@ msgstr "ошибочный шаблон Prometheus" msgid "invalid address range \"%1$s\"" msgstr "ошибочный диапазон адресов \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "ошибочная последовательность байт в UTF-8" @@ -20796,27 +20704,27 @@ msgstr "недопустимый четвертый параметр в функ msgid "invalid history storage period" msgstr "недопустимый период хранения истории" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "ошибочное имя группы узлов сети" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "ошибочное имя узла сети" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "недопустимое количество параметров в функции \"%1$s\"" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "недопустимое выражение диапазона" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "ошибочное регулярное выражение" @@ -20844,7 +20752,7 @@ msgstr "больше чем или равно" msgid "is less than or equals" msgstr "меньше чем или равно" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "не заключено в {} или ошибочно" @@ -20994,7 +20902,7 @@ msgstr "совпадает" msgid "max" msgstr "макс" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "макс. период меньше чем период фильтра времени по умолчанию" @@ -21034,7 +20942,7 @@ msgid "min() - Minimum value for period T" msgstr "min() - Минимальное значение за период Т" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "минимальная длина %1$s символов" @@ -21061,8 +20969,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "мс" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "должно быть %1$s символа" @@ -21083,8 +20991,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "должно содержать по крайней мере один макрос низкоуровневого обнаружения" @@ -21300,6 +21208,10 @@ msgstr "radians() - Конвертация значения из градусо msgid "rand() - A random integer value" msgstr "rand() - Случайное целое число" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21345,11 +21257,11 @@ msgstr "регулярное выражение" msgid "regular expression" msgstr "регулярное выражение" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "repeat() - Возвращает строку состоящую из значений, которые повторяются указанное количество раз" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "replace() - Поиск шаблона, входящего в значение, и замена на заменитель" @@ -21361,15 +21273,15 @@ msgstr "замена" msgid "right" msgstr "справа" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "right() - Возвращает количество самых правых символов" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "round() - Округление значение до десятичных знаков" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "rtrim() - Удаление указанных символов с конца строки" @@ -21417,7 +21329,7 @@ msgstr "" msgid "short description" msgstr "краткое описание" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21436,15 +21348,15 @@ msgstr "краткое описание" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "должно быть пустым" @@ -21460,31 +21372,31 @@ msgstr "показать соответствия иконок" msgid "sign in as guest" msgstr "войти как гость" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "signum() - Возвращает -1 - если значение отрицательное, 0 - если значение ноль, 1 - если значение положительное" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "sin() - Синус значения, где само значение представляет собой угол, в радианах." -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "sinh() - Гиперболический синус значения" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "skewness() - Измерение асимметрии распределения вероятностей" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "sqrt() - Квадратный корень значения" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "stddevpop() - Среднеквадратическое отклонение" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "stddevsamp() - Выборочное среднеквадратическое отклонение" @@ -21492,15 +21404,15 @@ msgstr "stddevsamp() - Выборочное среднеквадратическ msgid "sum" msgstr "сумма" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "sum() - Сумма значений за период Т" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "sumofsquares() - Сумма квадратов" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "заданная учётная запись не уникальна" @@ -21513,7 +21425,7 @@ msgstr "заданная учётная запись не уникальна" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21524,7 +21436,7 @@ msgstr "заданная учётная запись не уникальна" msgid "tag" msgstr "тег" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "tan() - Тангенс значения" @@ -21533,14 +21445,14 @@ msgstr "tan() - Тангенс значения" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "шаблон с ID \"%1$s\" был встречен %2$s раз" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21552,20 +21464,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "параметр \"%1$s\" отсутствует" @@ -21597,7 +21509,7 @@ msgstr "третий" msgid "third parameter is expected" msgstr "ожидается третий параметр" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "период времени фильтра по умолчанию превышает максимальный период" @@ -21605,31 +21517,31 @@ msgstr "период времени фильтра по умолчанию пр msgid "time shift" msgstr "сдвиг времени" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "time() - Текущее время" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft() - Время достижения порога вычисленное на основе периода Т" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "trendavg() - Среднее значение за период Т с точным сдвигом периода" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "trendcount() - Количество успешно полученных значений за период Т" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "trendmax() - Максимальное значение за период Т с точным сдвигом периода" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "trendmin() - Минимальное значение за период Т с точным сдвигом периода" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "trendsum() - Сумма значений за период Т с точным сдвигом периода" @@ -21643,7 +21555,7 @@ msgstr "триггер" msgid "trigger does not allow manual closing" msgstr "триггер не позволяет ручное закрытие" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "выражение триггера должно содержать по крайней мере одну ссылку /узел сети/ключ" @@ -21655,11 +21567,11 @@ msgstr "прототип триггера нельзя переместить в msgid "trigger with linkages cannot be moved to another template or host" msgstr "триггер со связями нельзя переместить в другой шаблон или узел сети" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "trim() - Удаление указанных символов с начала и конца строки" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "truncate() - Усечение значения до десятичных знаков" @@ -21668,7 +21580,7 @@ msgstr "truncate() - Усечение значения до десятичных msgid "type here to search" msgstr "начните печатать для поиска" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "неприемлемый URL" @@ -21716,11 +21628,12 @@ msgstr "неожиданное завершение макроса" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "неожиданный параметр \"%1$s\"" @@ -21746,8 +21659,8 @@ msgstr "неожиданный текст \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21772,6 +21685,10 @@ msgstr "неподдерживаемый суффикс времени" msgid "unsupported version number" msgstr "неподдерживаемый номер версии" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21829,61 +21746,71 @@ msgstr "значение \"%1$s\" не найдено" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "значение %1$s уже существует" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "значение слишком длинное" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 -#, c-format +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 +#, fuzzy, c-format msgid "value must be %1$s" -msgstr "значение должно быть %1$s" +msgid_plural "value must be one of %1$s" +msgstr[0] "значение должно быть %1$s" +msgstr[1] "значение должно быть %1$s" +msgstr[2] "значение должно быть %1$s" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "значение должно быть между \"%1$s\" и \"%2$s\"" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21914,15 +21841,13 @@ msgstr "значение должно быть не меньше чем \"%1$s\" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "значение должно быть одно из %1$s" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21931,7 +21856,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "значение первого параметра слишком длинное" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "значение тега нового события" @@ -21944,11 +21869,11 @@ msgstr "значение второго параметра слишком дли msgid "value of third parameter must be one of %1$s" msgstr "значением третьего параметра должно быть %1$s" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "varpop() - Дисперсия генеральной совокупности" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "varsamp() - Выборочная дисперсия" diff --git a/ui/locale/sk/LC_MESSAGES/frontend.po b/ui/locale/sk/LC_MESSAGES/frontend.po index 774e77aee72..4acb58a60b9 100644 --- a/ui/locale/sk/LC_MESSAGES/frontend.po +++ b/ui/locale/sk/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2013-08-25 22:42+0300\n" "Last-Translator: Jan <jan.garaj@gmail.com>\n" "Language-Team: Zabbix translation team\n" @@ -521,7 +521,7 @@ msgstr "Potvrdiť" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Potvrdenie" @@ -620,7 +620,7 @@ msgstr "Akcia \"%1$s\" už existuje." msgid "Action \"%1$s\" no operations defined." msgstr "Pre akciu \"%1$s\" nie je definovaná operácia." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -748,7 +748,7 @@ msgstr "Aktívny do" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -759,7 +759,7 @@ msgstr "Aktívny do" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -1015,7 +1015,7 @@ msgstr "Trvanie menšie ako" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1337,7 +1337,7 @@ msgstr "O (hodina:minúta)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1346,8 +1346,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1358,6 +1358,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1369,7 +1374,7 @@ msgstr "Minimálne jedna plánovaná odstávka musí byť vytvorená." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1455,7 +1460,7 @@ msgstr "Autentifikácia" msgid "Authentication algorithm" msgstr "Autentifikačný algoritmus" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1504,7 +1509,7 @@ msgstr "" msgid "Auto-login" msgstr "Automatické prihlásenie" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1515,7 +1520,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1774,7 +1779,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1809,7 +1814,7 @@ msgstr "Callback úroveň" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -2016,7 +2021,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2142,7 +2147,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Nie je možné zmazať interného Zabbix používateľa \"%1$s\", skúste ho vypnúť." @@ -2151,7 +2156,7 @@ msgstr "Nie je možné zmazať interného Zabbix používateľa \"%1$s\", skúst msgid "Cannot delete action" msgstr "Nie je možné zmazať akciu" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2223,7 +2228,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2298,7 +2303,7 @@ msgstr[0] "Nie je možné zmazať proxy" msgstr[1] "Nie je možné zmazať proxy" msgstr[2] "Nie je možné zmazať proxy" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2324,7 +2329,7 @@ msgstr[0] "Nie je možné zmazať skript" msgstr[1] "Nie je možné zmazať skript" msgstr[2] "Nie je možné zmazať skript" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Nie je možné zmazať skripty. Skript \"%1$s\" sa používa v operácii akcie \"%2$s\"." @@ -2744,16 +2749,16 @@ msgstr "Nemôžem nájsť mapu hodnôt \"%1$s\" použitú pre prototyp položky msgid "Cannot have empty visible template name." msgstr "Nie je možné mať prázdne zobrazované meno šablóny." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2767,7 +2772,7 @@ msgstr[0] "Nie je možné importovať šablónu \"%1$s\", prepojená šablóna \ msgstr[1] "Nie je možné importovať šablónu \"%1$s\", prepojené šablóny \"%2$s\" neexistujú." msgstr[2] "Nie je možné importovať šablónu \"%1$s\", prepojené šablóny \"%2$s\" neexistujú." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Nie je možné vložiť výraz spúšťača" @@ -2789,7 +2794,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2851,7 +2856,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Nie je možné čítať odpoveď, skontrolujte spojenie so Zabbix serverom \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Nie je možné premenovať používateľa guest." @@ -2935,7 +2940,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Nie je možné zrušiť prepojenie a zmazať web scenár." @@ -2948,7 +2953,7 @@ msgstr "Nie je možné zrušiť prepojenie šablóny" msgid "Cannot unlink template." msgstr "Nie je možné zrušiť prepojenie šablóny." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -3010,9 +3015,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Nie je možné aktualizovať zistený graf." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Nie je možné aktualizovať zistenú skupinu hostov." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3072,9 +3078,7 @@ msgstr "Nie je možné aktualizovať prototyp grafu" msgid "Cannot update group" msgstr "Nie je možné aktualizovať skupinu" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Nie je možné aktualizovať skupiny pre zisteného hosta \"%1$s\"." @@ -3161,12 +3165,12 @@ msgstr "Nie je možné aktualizovať mapu siete" msgid "Cannot update proxy" msgstr "Nie je možné aktualizovať proxy" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Nie je možné aktualizovať proxy pre zisteného hosta \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3186,9 +3190,9 @@ msgstr "" msgid "Cannot update script" msgstr "Nie je možné aktualizovať skript" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3374,8 +3378,8 @@ msgid "Character string not included" msgstr "Neobsahuje reťazec" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3551,7 +3555,7 @@ msgstr "Hodiny" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3589,13 +3593,13 @@ msgstr "Zatvoriť" msgid "Close expression constructor" msgstr "Zavrieť konštruktéra výrazu" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3692,7 +3696,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3703,11 +3707,6 @@ msgstr "Podmienka" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "Podmienka \"%2$s\" nie je použitá vo formule \"%3$s\" pre akciu \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3723,11 +3722,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "Podmienka \"%2$s\" použitá vo formule \"%3$s\" pre akciu \"%1$s\" nie je definovaná." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3919,7 +3913,7 @@ msgstr "Potvrdzujúci text" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Gratulácia! Práve ste úspešne nainštalovali Zabbix frontend." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4121,12 +4115,11 @@ msgstr "Kopírovať" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4156,16 +4149,6 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4176,8 +4159,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Počet" @@ -4549,7 +4532,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS meno" @@ -4825,8 +4808,8 @@ msgstr "Dec" msgid "December" msgstr "December" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4836,7 +4819,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4933,7 +4916,7 @@ msgstr "Oneskorené o" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4983,7 +4966,7 @@ msgstr "Zmazať a vyčistiť šablónu? (Pozor: všetky prepojené hosty budú t msgid "Delete current action?" msgstr "Zmazať aktuálnu akciu?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5281,7 +5264,7 @@ msgstr "" msgid "Dependencies" msgstr "Závislosti" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Podradená závislosť (tento ovplyvňuje)" @@ -5289,7 +5272,7 @@ msgstr "Podradená závislosť (tento ovplyvňuje)" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5498,10 +5481,10 @@ msgstr "Zakázať označené scenáre?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5584,7 +5567,7 @@ msgid "Discovery by proxy" msgstr "Zisťovanie cez proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Kontrola zisťovania" @@ -5596,7 +5579,7 @@ msgstr "Kontroly zisťovania" msgid "Discovery list" msgstr "Zisťovací zoznam" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Objekt zisťovania" @@ -5699,7 +5682,7 @@ msgstr "Zisťovacie pravidlo aktualizované" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5710,7 +5693,7 @@ msgstr "Zisťovacie pravidlá" msgid "Discovery rules deleted" msgstr "Zisťovacie pravidlá vymazané" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Stav zisťovania" @@ -5866,18 +5849,6 @@ msgstr "" msgid "Draw style" msgstr "Štýl vykreslenia" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5890,11 +5861,6 @@ msgstr "Duplicitné \"meno\" hodnoty \"%1$s\" pre mapu." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -6054,10 +6020,6 @@ msgstr "Prázdny súbor SSL kľúča pre web scenár \"%1$s\"." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6084,11 +6046,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6273,7 +6233,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6284,7 +6244,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6327,7 +6287,7 @@ msgid "English (en_US)" msgstr "Anglicky (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6402,7 +6362,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6437,11 +6397,11 @@ msgstr "Monitoring logu udalostí. Vráti log" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Typ udalosti" @@ -6778,7 +6738,6 @@ msgstr "Pole \"%1$s\" nemôže byť nastavené na NULL." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7146,7 +7105,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Zadaný výraz nie je makro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7392,12 +7351,12 @@ msgstr "Mriežka" msgid "Group" msgstr "Skupina" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Skupinu \"%1$s\" nie je možné zmazať, pretože je používaná prototypom hosta." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7731,7 +7690,7 @@ msgstr[2] "Hostov" msgid "Host \"%1$s\" already exists." msgstr "Host \"%1$s\" už existuje." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7739,7 +7698,7 @@ msgstr "Host \"%1$s\" už existuje." msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7812,17 +7771,17 @@ msgstr[2] "Hosty povolené" msgid "Host group" msgstr "Skupina hostov" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Skupina hostov \"%1$s\" už existuje." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Skupinu hostov \"%1$s\" nie je možné zmazať, pretože je použitá v globálnom skripte." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7836,9 +7795,9 @@ msgid "Host group label type" msgstr "Typ popisku skupiny" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7854,8 +7813,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -8044,7 +8003,7 @@ msgstr "Host s rovnakým zobrazovaným menom \"%1$s\" už existuje." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8132,7 +8091,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP adresa" @@ -8157,7 +8116,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8214,12 +8173,12 @@ msgstr "Zvýraznenie ikony" msgid "Icon map" msgstr "Mapová ikona" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Mapová ikona \"%1$s\" nemôže byť zmazaná. Je použitá v mape \"%2$s\"." @@ -8243,7 +8202,7 @@ msgstr "Mapová ikona aktualizovaná" msgid "Icon mapping" msgstr "Mapovanie ikon" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8476,7 +8435,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8489,11 +8448,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8705,24 +8664,6 @@ msgstr "Neplatná prevádzková akcia používateľskej skupiny. Skupina neexist msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Neplatná prevádzková akcia používateľa. Používateľ neexistuje alebo nemáte k nemu prístup." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8807,20 +8748,11 @@ msgstr "Nesprávne podmienky pre akciu \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Nesprávne podmienky pre zisťovacie pravidlo \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "Nesprávny vlastný výraz \"%2$s\" pre akciu \"%1$s\": %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8885,11 +8817,6 @@ msgstr "Nesprávna filtrovacia podmienka ID vzorca pre akciu \"%1$s\"." msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Nesprávna filtrovacia podmienka ID vzorca pre zisťovacie pravidlo \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8997,7 +8924,7 @@ msgstr "Neplatné ID mapy." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Neplatná metóda \"%1$s.%2$s\"." @@ -9111,11 +9038,6 @@ msgstr "Neplatný výraz prototypu spúšťača. Elementy výrazu prototypu spú msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Nesprávny typ kalkulácie pre akciu \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9137,10 +9059,10 @@ msgstr "Nesprávne user ID špecifikované pre mapu \"%1$s\"." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "Nesprávne user group ID špecifikované pre mapu \"%1$s\"." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9202,18 +9124,6 @@ msgstr "Neplatná hodnota \"%1$s\" pre int pole \"%2$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Neplatná hodnota \"%1$s\" pre unsigned int pole \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9275,12 +9185,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9392,7 +9296,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9403,9 +9307,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9556,7 +9460,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Vložiť" @@ -9684,7 +9588,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Interval" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9707,7 +9611,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9721,7 +9625,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9768,9 +9672,11 @@ msgstr "Neplatné parametre metódy." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9810,17 +9716,17 @@ msgstr "Neplatné parametre metódy." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9828,14 +9734,14 @@ msgstr "Neplatné parametre metódy." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9843,111 +9749,116 @@ msgstr "Neplatné parametre metódy." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10161,7 +10072,7 @@ msgstr[2] "Položky povolené" msgid "Item in \"not supported\" state" msgstr "Položka je v \"not supported\" stave" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Položka nie je označená" @@ -10342,7 +10253,7 @@ msgstr "Položky aktualizované" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10535,7 +10446,7 @@ msgstr "Umiestnenie popisku" msgid "Language" msgstr "Jazyk" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11142,7 +11053,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11385,7 +11296,7 @@ msgstr[0] "Maximálna časová perióda na zobrazenie je %1$s deň." msgstr[1] "Maximálna časová perióda na zobrazenie je %1$s dni." msgstr[2] "Maximálna časová perióda na zobrazenie je %1$s dní." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11410,7 +11321,7 @@ msgstr "Médiá" msgid "Media type" msgstr "Typ média" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Typ média \"%1$s\" už existuje." @@ -11457,7 +11368,7 @@ msgstr "" msgid "Media type updated" msgstr "Typ média aktualizovaný" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11469,7 +11380,7 @@ msgstr "" msgid "Media types" msgstr "Typy médií" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11721,7 +11632,7 @@ msgstr[2] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12123,15 +12034,17 @@ msgstr "" msgid "New element" msgstr "Nový element" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12151,7 +12064,7 @@ msgstr "" msgid "New service time" msgstr "Nový čas služby" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12178,7 +12091,7 @@ msgstr "Ďalší krok" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12207,30 +12120,6 @@ msgstr "Ďalší krok" msgid "No" msgstr "Nie" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12280,11 +12169,6 @@ msgstr "Nie je špecifikované používateľské meno autentifikácie." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12423,17 +12307,46 @@ msgstr "Žiadne výbery nenájdené" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Žiadne oprávnenia pre prístup do systému." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12469,10 +12382,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12500,13 +12412,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12526,8 +12443,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12550,24 +12467,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12589,16 +12506,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12654,7 +12571,7 @@ msgstr "Žiadne definované spúšťače." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12724,15 +12641,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Nie je povolené nastavenie hesla pre používateľa \"guest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -13066,15 +12983,16 @@ msgstr "Vypnuté" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -13096,10 +13014,6 @@ msgstr "Raz" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Jeden z objekov je bez skupiny hostov." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Jednorázovo" @@ -13109,10 +13023,6 @@ msgstr "Jednorázovo" msgid "One-time downtime" msgstr "Jednorázový prestoj" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Len super administrátori môžu vytvoriť skupiny." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Len kontroly typu Zabbix agent, SNMPv1, SNMPv2 alebo SNMPv3 môžu byť unikátne." @@ -13162,10 +13072,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13174,10 +13080,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Len spúšťače priradené k monitorovaným hostom alebo závislé na monitorovaných položkách sú započítané" @@ -13226,7 +13128,7 @@ msgstr "Operácia nemá šablónu na vykonanie." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13235,33 +13137,33 @@ msgstr "" msgid "Operations" msgstr "Operácie" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Operátor" @@ -13670,16 +13572,16 @@ msgstr "" msgid "Parameter" msgstr "Parameter" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13816,7 +13718,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13862,7 +13764,7 @@ msgstr "Vykonať DNS dotaz. Vráti reťazec s požadovaným typom informácie" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13995,7 +13897,7 @@ msgstr "Vypĺňa polia hostovho inventára" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14315,7 +14217,7 @@ msgstr "Proxy" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14323,7 +14225,7 @@ msgstr "Proxy" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14333,12 +14235,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Proxy \"%1$s\" pre host \"%2$s\" neexistuje." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Proxy \"%1$s\" je použitá zisťovacím pravidlom \"%2$s\"." @@ -14614,7 +14516,7 @@ msgstr "" msgid "Regular expression" msgstr "Regulárny výraz" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14875,7 +14777,7 @@ msgid "Replace dependencies" msgstr "Nahradiť závislosti" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -15072,7 +14974,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Výsledok" @@ -15313,7 +15215,7 @@ msgstr "SMTP server port" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15614,7 +15516,7 @@ msgstr "" msgid "Script" msgstr "Skript" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Skript \"%1$s\" už existuje." @@ -15729,7 +15631,7 @@ msgid "Security name" msgstr "Bezpečnostné meno" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15945,11 +15847,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Čas štartu služby musi byť menší ako jej koniec." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15961,7 +15863,7 @@ msgstr "" msgid "Service times" msgstr "Časy služby" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Typ služby" @@ -15974,7 +15876,7 @@ msgstr "" msgid "Service updated" msgstr "Služba aktualizovaná" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15986,7 +15888,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -16004,9 +15906,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Sedenie ukončené, prosím prihláste sa znovu." @@ -16068,7 +15970,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16913,10 +16815,10 @@ msgstr "Tabuľka \"%1$s\" neobsahuje pole s menom \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Označenie" @@ -17053,7 +16955,7 @@ msgstr "Šablóna" msgid "Template \"%1$s\" already exists." msgstr "Šablóna \"%1$s\" už existuje." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17137,7 +17039,7 @@ msgstr "Šablóna s rovnakým viditeľným menom \"%1$s\" už existuje." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17436,7 +17338,7 @@ msgstr "Do" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17848,7 +17750,7 @@ msgstr "Spúšťač aktualizovaný" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17912,9 +17814,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17924,7 +17826,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17976,7 +17878,7 @@ msgstr "Typ informácií" msgid "Types" msgstr "Typy" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -18047,8 +17949,8 @@ msgstr "URL musí mať \"meno\" a \"url\" v mape \"%1$s\"." msgid "URLs" msgstr "URLky" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18158,21 +18060,23 @@ msgstr "Jednotky" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Neznámy" @@ -18190,7 +18094,7 @@ msgid "Unknown error" msgstr "Neznáma chyba" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Neznáme položky hosta, nenájdené položky na označenom hostovi" @@ -18330,7 +18234,7 @@ msgstr "Dostupný" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18464,37 +18368,37 @@ msgstr "Používané v akciách" msgid "User" msgstr "Používateľ" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "Používateľ \"%1$s\" je vlastníkom mapy \"%2$s\"." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18516,13 +18420,13 @@ msgstr "Používateľ pridaný" msgid "User agent string" msgstr "User agent reťazec" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Používateľ nemôže sám seba pridať do vypnutej skupiny alebo do skupiny s vypnutým GUI prístupom." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18547,27 +18451,27 @@ msgstr[2] "" msgid "User group" msgstr "Používateľská skupina" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Používateľská skupina \"%1$s\" už existuje." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Skupina \"%1$s\" je použitá v nastavení skupiny pre správu o nefunčnej databáze." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Používateľská skupina \"%1$s\" je použitá v skripte \"%2$s\"." @@ -18603,9 +18507,9 @@ msgstr[2] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18620,7 +18524,7 @@ msgstr "" msgid "User groups" msgstr "Používateľské skupiny" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Používateľ nemá dovolené zmazať sám seba." @@ -18655,7 +18559,7 @@ msgstr "Profil používateľa" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18675,7 +18579,7 @@ msgstr[2] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18726,12 +18630,12 @@ msgstr "Používateľ aktualizovaný" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -19042,14 +18946,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19161,11 +19065,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Hodnota Windows čítača výkonu. Vráti celé, desatinné číslo, reťazec alebo text (závisí na dotaze)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19704,7 +19609,7 @@ msgstr "Ročne" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19761,7 +19666,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19894,11 +19798,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19906,16 +19810,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "reťazec znakov je očakávaný" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19924,37 +19828,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19975,7 +19879,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19983,19 +19887,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -20045,7 +19949,7 @@ msgstr "všetky" msgid "all media" msgstr "všetky médiá" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -20067,23 +19971,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "pole je očakávané" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -20093,7 +19997,7 @@ msgid "an empty string is expected" msgstr "prázdny reťazec je očakávaný" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -20101,11 +20005,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20266,13 +20174,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20303,13 +20205,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20327,14 +20229,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20407,7 +20309,8 @@ msgid "configure" msgstr "nastaviť" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20498,7 +20401,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20520,13 +20423,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20552,7 +20455,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20589,7 +20493,7 @@ msgstr "výraz je prázdny" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20680,7 +20584,7 @@ msgstr "ikonka" msgid "image" msgstr "obrázok" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20725,15 +20629,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "nesprávna syntax pri \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20761,7 +20669,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20790,27 +20698,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20838,7 +20746,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20988,7 +20896,7 @@ msgstr "zhody" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -21028,7 +20936,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -21055,8 +20963,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -21077,8 +20985,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21294,6 +21202,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21339,11 +21251,11 @@ msgstr "" msgid "regular expression" msgstr "regulárny výraz" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21355,15 +21267,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21411,7 +21323,7 @@ msgstr "" msgid "short description" msgstr "krátky popis" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21430,15 +21342,15 @@ msgstr "krátky popis" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21454,31 +21366,31 @@ msgstr "zobraziť mapovanie ikon" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21486,15 +21398,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21507,7 +21419,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21518,7 +21430,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21527,14 +21439,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "šablóna ID \"%1$s\" je použitá %2$s krát" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21546,20 +21458,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21591,7 +21503,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21599,31 +21511,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21637,7 +21549,7 @@ msgstr "spúšťač" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21649,11 +21561,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21662,7 +21574,7 @@ msgstr "" msgid "type here to search" msgstr "Vyhľadávanie" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21710,11 +21622,12 @@ msgstr "neočakávaný koniec makra" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21740,8 +21653,8 @@ msgstr "neočakávaný text \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21766,6 +21679,10 @@ msgstr "" msgid "unsupported version number" msgstr "nepodporované číslo verzie" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21823,61 +21740,71 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21908,15 +21835,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21925,7 +21850,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21938,11 +21863,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/sv/LC_MESSAGES/frontend.po b/ui/locale/sv/LC_MESSAGES/frontend.po index 03bdc08b431..04b302a9748 100644 --- a/ui/locale/sv/LC_MESSAGES/frontend.po +++ b/ui/locale/sv/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2021-03-19 18:15+0300\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -500,7 +500,7 @@ msgstr "Bekräfta" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Bekräftade" @@ -599,7 +599,7 @@ msgstr "" msgid "Action \"%1$s\" no operations defined." msgstr "" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -725,7 +725,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -736,7 +736,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -992,7 +992,7 @@ msgstr "" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1314,7 +1314,7 @@ msgstr "" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1323,8 +1323,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1335,6 +1335,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1346,7 +1351,7 @@ msgstr "" msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1432,7 +1437,7 @@ msgstr "" msgid "Authentication algorithm" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1481,7 +1486,7 @@ msgstr "" msgid "Auto-login" msgstr "" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1492,7 +1497,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1751,7 +1756,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1786,7 +1791,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1992,7 +1997,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2114,7 +2119,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "" @@ -2123,7 +2128,7 @@ msgstr "" msgid "Cannot delete action" msgstr "Kan inte ta bort åtgärd" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2190,7 +2195,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2261,7 +2266,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2284,7 +2289,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "" @@ -2678,16 +2683,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2700,7 +2705,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "" msgstr[1] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "" @@ -2721,7 +2726,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2783,7 +2788,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "" @@ -2866,7 +2871,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "" @@ -2879,7 +2884,7 @@ msgstr "" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2941,8 +2946,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -3002,9 +3008,7 @@ msgstr "" msgid "Cannot update group" msgstr "Kan inte uppdatera grupp" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -3087,12 +3091,12 @@ msgstr "" msgid "Cannot update proxy" msgstr "" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3112,9 +3116,9 @@ msgstr "" msgid "Cannot update script" msgstr "" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3297,8 +3301,8 @@ msgid "Character string not included" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3474,7 +3478,7 @@ msgstr "Klocka" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3512,13 +3516,13 @@ msgstr "" msgid "Close expression constructor" msgstr "" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3615,7 +3619,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3626,11 +3630,6 @@ msgstr "Villkor" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3646,11 +3645,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3842,7 +3836,7 @@ msgstr "" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4044,12 +4038,11 @@ msgstr "" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4076,16 +4069,6 @@ msgid_plural "Correlations enabled" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4096,8 +4079,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Antal" @@ -4469,7 +4452,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "" @@ -4744,8 +4727,8 @@ msgstr "" msgid "December" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4755,7 +4738,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4852,7 +4835,7 @@ msgstr "" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4902,7 +4885,7 @@ msgstr "" msgid "Delete current action?" msgstr "" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5200,7 +5183,7 @@ msgstr "" msgid "Dependencies" msgstr "" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "" @@ -5208,7 +5191,7 @@ msgstr "" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5417,10 +5400,10 @@ msgstr "" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5503,7 +5486,7 @@ msgid "Discovery by proxy" msgstr "" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "" @@ -5515,7 +5498,7 @@ msgstr "" msgid "Discovery list" msgstr "" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "" @@ -5614,7 +5597,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5625,7 +5608,7 @@ msgstr "" msgid "Discovery rules deleted" msgstr "" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "" @@ -5781,18 +5764,6 @@ msgstr "" msgid "Draw style" msgstr "Ritstil" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5805,11 +5776,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5969,10 +5935,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -5999,11 +5961,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6188,7 +6148,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6199,7 +6159,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6242,7 +6202,7 @@ msgid "English (en_US)" msgstr "" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6317,7 +6277,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6352,11 +6312,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6692,7 +6652,6 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7060,7 +7019,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7305,12 +7264,12 @@ msgstr "" msgid "Group" msgstr "Grupp" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7643,7 +7602,7 @@ msgstr[1] "Värd" msgid "Host \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7651,7 +7610,7 @@ msgstr "" msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7722,17 +7681,17 @@ msgstr[1] "" msgid "Host group" msgstr "Värdgrupp" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7746,9 +7705,9 @@ msgid "Host group label type" msgstr "" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7764,8 +7723,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7952,7 +7911,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8040,7 +7999,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP-adress" @@ -8065,7 +8024,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8122,12 +8081,12 @@ msgstr "" msgid "Icon map" msgstr "" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "" @@ -8151,7 +8110,7 @@ msgstr "" msgid "Icon mapping" msgstr "" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8382,7 +8341,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8395,11 +8354,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8611,24 +8570,6 @@ msgstr "" msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "" -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8713,20 +8654,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8791,11 +8723,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8903,7 +8830,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -9017,11 +8944,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9043,10 +8965,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9108,18 +9030,6 @@ msgstr "" msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9181,12 +9091,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9298,7 +9202,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9309,9 +9213,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9462,7 +9366,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "" @@ -9590,7 +9494,7 @@ msgstr "" msgid "Interval" msgstr "" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9613,7 +9517,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9627,7 +9531,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9674,9 +9578,11 @@ msgstr "" #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9716,17 +9622,17 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9734,14 +9640,14 @@ msgstr "" #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9749,111 +9655,116 @@ msgstr "" #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10064,7 +9975,7 @@ msgstr[1] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10243,7 +10154,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10436,7 +10347,7 @@ msgstr "Etikettposition" msgid "Language" msgstr "Språk" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11037,7 +10948,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11279,7 +11190,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11304,7 +11215,7 @@ msgstr "Media" msgid "Media type" msgstr "Mediatyp" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11348,7 +11259,7 @@ msgstr "" msgid "Media type updated" msgstr "Mediatyp uppdaterad" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11360,7 +11271,7 @@ msgstr "" msgid "Media types" msgstr "Mediatyper" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11607,7 +11518,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12009,15 +11920,17 @@ msgstr "" msgid "New element" msgstr "" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12037,7 +11950,7 @@ msgstr "" msgid "New service time" msgstr "" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12064,7 +11977,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12093,30 +12006,6 @@ msgstr "" msgid "No" msgstr "Nej" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12166,11 +12055,6 @@ msgstr "" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12309,17 +12193,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12355,10 +12268,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12386,13 +12298,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12412,8 +12329,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12436,24 +12353,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12475,16 +12392,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12540,7 +12457,7 @@ msgstr "" msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12610,15 +12527,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12952,15 +12869,16 @@ msgstr "AV" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12982,10 +12900,6 @@ msgstr "" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "" @@ -12995,10 +12909,6 @@ msgstr "" msgid "One-time downtime" msgstr "" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "" - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -13047,10 +12957,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13059,10 +12965,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "" @@ -13111,7 +13013,7 @@ msgstr "" msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13120,33 +13022,33 @@ msgstr "" msgid "Operations" msgstr "" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "" @@ -13555,16 +13457,16 @@ msgstr "" msgid "Parameter" msgstr "Parameter" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13701,7 +13603,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13747,7 +13649,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13880,7 +13782,7 @@ msgstr "" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14200,7 +14102,7 @@ msgstr "" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14208,7 +14110,7 @@ msgstr "" msgid "Proxy" msgstr "" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14218,12 +14120,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "" -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "" @@ -14498,7 +14400,7 @@ msgstr "" msgid "Regular expression" msgstr "" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14758,7 +14660,7 @@ msgid "Replace dependencies" msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14955,7 +14857,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "" @@ -15196,7 +15098,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15494,7 +15396,7 @@ msgstr "" msgid "Script" msgstr "Skript" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15608,7 +15510,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15823,11 +15725,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "" -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15839,7 +15741,7 @@ msgstr "" msgid "Service times" msgstr "" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "" @@ -15852,7 +15754,7 @@ msgstr "" msgid "Service updated" msgstr "Tjänst uppdaterad" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15864,7 +15766,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15882,9 +15784,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "" @@ -15946,7 +15848,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16791,10 +16693,10 @@ msgstr "" #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Tagg" @@ -16931,7 +16833,7 @@ msgstr "Mall" msgid "Template \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17015,7 +16917,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17312,7 +17214,7 @@ msgstr "Till" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17719,7 +17621,7 @@ msgstr "Utlösare uppdaterades" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17783,9 +17685,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17795,7 +17697,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17847,7 +17749,7 @@ msgstr "Typ av information" msgid "Types" msgstr "" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17918,8 +17820,8 @@ msgstr "" msgid "URLs" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18029,21 +17931,23 @@ msgstr "Enheter" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Okänd" @@ -18061,7 +17965,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "" @@ -18200,7 +18104,7 @@ msgstr "" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18334,37 +18238,37 @@ msgstr "" msgid "User" msgstr "Användare" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18386,13 +18290,13 @@ msgstr "Användare lades till" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "" #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18416,27 +18320,27 @@ msgstr[1] "" msgid "User group" msgstr "Användargrupp" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "" @@ -18470,9 +18374,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18487,7 +18391,7 @@ msgstr "" msgid "User groups" msgstr "Användargrupper" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "" @@ -18522,7 +18426,7 @@ msgstr "Användarprofil" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18541,7 +18445,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18591,12 +18495,12 @@ msgstr "Användare uppdaterades" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18907,14 +18811,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19026,11 +18930,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19567,7 +19472,7 @@ msgstr "Årligen" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19624,7 +19529,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19757,11 +19661,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19769,16 +19673,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19787,37 +19691,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19838,7 +19742,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19846,19 +19750,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19908,7 +19812,7 @@ msgstr "alla" msgid "all media" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19930,23 +19834,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19956,7 +19860,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19964,11 +19868,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20129,13 +20037,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20166,13 +20068,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20190,14 +20092,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20270,7 +20172,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20361,7 +20264,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20383,13 +20286,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20415,7 +20318,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20452,7 +20356,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20543,7 +20447,7 @@ msgstr "" msgid "image" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20588,15 +20492,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20624,7 +20532,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20653,27 +20561,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20701,7 +20609,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20851,7 +20759,7 @@ msgstr "" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20891,7 +20799,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20918,8 +20826,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20940,8 +20848,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21157,6 +21065,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21202,11 +21114,11 @@ msgstr "" msgid "regular expression" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21218,15 +21130,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21274,7 +21186,7 @@ msgstr "" msgid "short description" msgstr "" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21293,15 +21205,15 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21317,31 +21229,31 @@ msgstr "" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21349,15 +21261,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21370,7 +21282,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21381,7 +21293,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21390,14 +21302,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21409,20 +21321,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21454,7 +21366,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21462,31 +21374,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21500,7 +21412,7 @@ msgstr "" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21512,11 +21424,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21525,7 +21437,7 @@ msgstr "" msgid "type here to search" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21573,11 +21485,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21603,8 +21516,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21629,6 +21542,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21686,61 +21603,69 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21771,15 +21696,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21788,7 +21711,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21801,11 +21724,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/tr/LC_MESSAGES/frontend.po b/ui/locale/tr/LC_MESSAGES/frontend.po index dc523ce046a..4cc96311c66 100644 --- a/ui/locale/tr/LC_MESSAGES/frontend.po +++ b/ui/locale/tr/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2021-03-19 18:15+0300\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: Zabbix translation team\n" @@ -502,7 +502,7 @@ msgstr "Onay" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Onaylandı" @@ -601,7 +601,7 @@ msgstr "\"%1$s\" eylemi halihazırda var." msgid "Action \"%1$s\" no operations defined." msgstr "Eylem \"%1$s\" hiçbir işlem tanımlanmadı." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -727,7 +727,7 @@ msgstr "Şu zamana kadar aktif" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -738,7 +738,7 @@ msgstr "Şu zamana kadar aktif" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -994,7 +994,7 @@ msgstr "Şu yaştan küçük" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1316,7 +1316,7 @@ msgstr "Zamanında (saat:dakika)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1325,8 +1325,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1337,6 +1337,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1348,7 +1353,7 @@ msgstr "En azından bir tane bakım periyodu yaratılmalı." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1434,7 +1439,7 @@ msgstr "Kimlik Doğrulama" msgid "Authentication algorithm" msgstr "Kimlik doğrulama algoritması" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1483,7 +1488,7 @@ msgstr "" msgid "Auto-login" msgstr "Otomatik giriş" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Otomatik giriş ve otomatik çıkış seçenekleri birlikte etkinleştirilemez." @@ -1494,7 +1499,7 @@ msgstr "Otomatik çıkış" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1754,7 +1759,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1789,7 +1794,7 @@ msgstr "Geri çağırma" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1995,7 +2000,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2117,7 +2122,7 @@ msgid_plural "Cannot delete API tokens" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "\"%1$s\" Zabbix dahili kullanıcısı silinemiyor, bu kullanıcıyı devredışı bırakmayı deneyin." @@ -2126,7 +2131,7 @@ msgstr "\"%1$s\" Zabbix dahili kullanıcısı silinemiyor, bu kullanıcıyı dev msgid "Cannot delete action" msgstr "Eylem silinemiyor" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2194,7 +2199,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2265,7 +2270,7 @@ msgid_plural "Cannot delete proxies" msgstr[0] "Vekil sunucu silinemiyor" msgstr[1] "Vekil sunucular silinemiyor" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2288,7 +2293,7 @@ msgid_plural "Cannot delete scripts" msgstr[0] "Betik silinemiyor" msgstr[1] "Betikler silinemiyor" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Betikler silinemiyor. \"%1$s\" betiği \"%2$s\" eylem işleminde kullanılıyor." @@ -2682,16 +2687,16 @@ msgstr "\"%4$s\" üzerindeki \"%3$s\" keşif kuralının öğe prototipi \"%2$s\ msgid "Cannot have empty visible template name." msgstr "Görünür şablon adı boş olamaz." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2704,7 +2709,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not msgstr[0] "\"%1$s\" şablonu içe aktarılamıyor, \"%2$s\" bağlantılı şablonu mevcut değil." msgstr[1] "\"%1$s\" şablonu içe aktarılamıyor, \"%2$s\" bağlantılı şablonları mevcut değil." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Tetikleyici ifadesi eklenemiyor" @@ -2725,7 +2730,7 @@ msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2787,7 +2792,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Yanıt okunamıyor, Zabbix sunucusu \"%1$s\" ile bağlantıyı kontrol edin." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Misafir kullanıcısı yeniden adlandırılamıyor." @@ -2870,7 +2875,7 @@ msgid_plural "Cannot unblock users" msgstr[0] "" msgstr[1] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Web senaryolarının bağlantısı kaldırılıp temizlenemiyor." @@ -2883,7 +2888,7 @@ msgstr "Şablonun bağlantısı kaldırılamadı" msgid "Cannot unlink template." msgstr "Şablonun bağlantısı kaldırılamıyor." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2945,9 +2950,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Keşfedilmiş bir grafik güncellenemiyor." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Keşfedilmiş bir ana makine grubu güncellenemiyor." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3006,9 +3012,7 @@ msgstr "Grafik prototipi güncellenemiyor" msgid "Cannot update group" msgstr "Grup güncellenemiyor" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Keşfedilen ana makine \"%1$s\" için gruplar güncellenemiyor." @@ -3091,12 +3095,12 @@ msgstr "Ağ haritası güncellenemiyor" msgid "Cannot update proxy" msgstr "Vekil sunucu güncellenemiyor" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Keşfedilen ana makine \"%1$s\" için vekil sunucu güncellenemiyor." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3116,9 +3120,9 @@ msgstr "" msgid "Cannot update script" msgstr "Betik güncellenemiyor" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3301,8 +3305,8 @@ msgid "Character string not included" msgstr "Karakter dizgisi içerilmiyor" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3478,7 +3482,7 @@ msgstr "Saat" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3516,13 +3520,13 @@ msgstr "Kapat" msgid "Close expression constructor" msgstr "İfade düzenleyicisini kapat" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Yeni olayı kapat" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Eski olayları kapat" @@ -3619,7 +3623,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "Eşzamanlı oturumlar" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3630,11 +3634,6 @@ msgstr "Koşul" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "\"%1$s\" eylemi için \"%3$s\" formülünde \"%2$s\" koşulu kullanılmıyor." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "\"%1$s\" korelasyonu için \"%3$s\" formülünde \"%2$s\" durumu kullanılmıyor." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3650,11 +3649,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "\"%1$s\" eylemi için \"%3$s\" formülünde kullanılan \"%2$s\" durumu tanımlanmadı." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "\"%1$s\" korelasyonu için \"%3$s\" formülünde kullanılan \"%2$s\" durumu tanımlanmadı." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3846,7 +3840,7 @@ msgstr "Onaylama metni" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Tebrikler! Zabbix önyüzünü başarıyla kurdunuz." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4048,12 +4042,11 @@ msgstr "Kopyala" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Korelasyon" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "Korelasyon \"%1$s\" halihazırda mevcut." @@ -4081,16 +4074,6 @@ msgid_plural "Correlations enabled" msgstr[0] "Korelasyon etkinleştirildi" msgstr[1] "Korelasyonlar etkinleştirildi" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "Korelasyonda eksik parametreler var: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "Korelasyon adı boş olamaz." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Korelasyon kuralı" @@ -4101,8 +4084,8 @@ msgstr "Korelasyon güncellendi" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Sayı" @@ -4474,7 +4457,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS adı" @@ -4749,8 +4732,8 @@ msgstr "Ara" msgid "December" msgstr "Aralık" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4760,7 +4743,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4857,7 +4840,7 @@ msgstr "Gecikmenin yapıldığı" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4907,7 +4890,7 @@ msgstr "Şablon silinsin ve temizlensin mi? (Uyarı: bütün bağlantılı ana m msgid "Delete current action?" msgstr "Şu anki eylem silinsin mi?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Mevcut korelasyon silinsin mi?" @@ -5205,7 +5188,7 @@ msgstr "" msgid "Dependencies" msgstr "Bağımlılıklar" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Bağımlı" @@ -5213,7 +5196,7 @@ msgstr "Bağımlı" msgid "Dependent item" msgstr "Bağımlı öğe" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5422,10 +5405,10 @@ msgstr "Seçilen web senaryoları devre dışı bırakılsın mı?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5508,7 +5491,7 @@ msgid "Discovery by proxy" msgstr "Vekil sunucu aracılığıyla keşif" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Keşif kontrolü" @@ -5520,7 +5503,7 @@ msgstr "Keşif kontrolleri" msgid "Discovery list" msgstr "Keşif listesi" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Keşif objesi" @@ -5620,7 +5603,7 @@ msgstr "Keşif kuralı güncellendi" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5631,7 +5614,7 @@ msgstr "Keşif kuralları" msgid "Discovery rules deleted" msgstr "Keşif kuralları silindi" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Keşif durumu" @@ -5787,18 +5770,6 @@ msgstr "" msgid "Draw style" msgstr "Çizim stili" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "\"%3$s\" korelasyonu için \"%2$s\" \"%1$s\" değeri mükerrer." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Korelasyon için \"%2$s\" \"%1$s\" değeri mükerrer." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5811,11 +5782,6 @@ msgstr "Harita için \"%1$s\" \"name\" değeri mükerrer." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5975,10 +5941,6 @@ msgstr "Web senaryosu \"%1$s\" için boş SSL anahtar dosyası." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "Boş korelasyon ID'si." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6005,11 +5967,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6194,7 +6154,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6205,7 +6165,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6248,7 +6208,7 @@ msgid "English (en_US)" msgstr "Amerikan İngilizcesi (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6323,7 +6283,7 @@ msgid "Event correlation" msgstr "Olay korelasyonu" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Olay korelasyon kuralları" @@ -6358,11 +6318,11 @@ msgstr "Olay günlüğü izlemesi. Sistem günlüğü döndürür" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Olay etiket çifti" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Olay tipi" @@ -6698,7 +6658,6 @@ msgstr "\"%1$s\" alanı NULL olarak ayarlanamıyor." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7066,7 +7025,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Verilen ifade bir makro değil" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "\"%1$s\" genel düzenli ifadesi mevcut değil." @@ -7311,12 +7270,12 @@ msgstr "Izgara" msgid "Group" msgstr "Grup" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "\"%1$s\" grubu, bir ana makine prototipi tarafından kullanıldığı için silinemez." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "\"%1$s\" grubu, bir korelasyon koşulunda kullanıldığından silinemiyor." @@ -7648,7 +7607,7 @@ msgstr[1] "Ana makineler" msgid "Host \"%1$s\" already exists." msgstr "\"%1$s\" ana makinesi zaten var." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7656,7 +7615,7 @@ msgstr "\"%1$s\" ana makinesi zaten var." msgid "Host \"%1$s\" cannot be without host group." msgstr "\"%1$s\" ana makinesi, ana makine grubu olmadan bulunamaz." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7727,17 +7686,17 @@ msgstr[1] "Ana makineler etkin" msgid "Host group" msgstr "Ana makine grubu" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "\"%1$s\" ana makine grubu zaten var." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "\"%1$s\" adlı ana makine grubu, genel bir komut dizisinde kullanıldığından silinemiyor." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7751,9 +7710,9 @@ msgid "Host group label type" msgstr "Ana makine grubu etiket türü" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "\"%1$s\" ID'li ana makine grubu mevcut değil." @@ -7769,8 +7728,8 @@ msgstr "\"%1$s\" ID'li ana makine grubu mevcut değil." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7957,7 +7916,7 @@ msgstr "\"%1$s\" görünür adlı bir ana makine halihazırda mevcut." #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8045,7 +8004,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP adresi" @@ -8070,7 +8029,7 @@ msgstr "\"%1$s\" IP aralığı, \"%2$s\" adres sınırını aşıyor" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8127,12 +8086,12 @@ msgstr "Simge aydınlatma" msgid "Icon map" msgstr "Simge haritası" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Simge haritası \"%1$s\" silinemiyor. \"%2$s\" haritasında kullanılıyor." @@ -8156,7 +8115,7 @@ msgstr "Simge haritası güncellendi" msgid "Icon mapping" msgstr "Simge eşleştirme" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "\"%1$s\" ID'li simge mevcut değil." @@ -8387,7 +8346,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8400,11 +8359,11 @@ msgstr "Erişilemeyen harita" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8616,24 +8575,6 @@ msgstr "Yanlış eylem işlem kullanıcı grubu. Kullanıcı grubu mevcut değil msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Yanlış eylem işlem kullanıcısı. Kullanıcı mevcut değil veta sizin bu kullanıcıya erişiminiz yok." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8718,20 +8659,11 @@ msgstr "\"%1$s\" eylemi için yanlış koşullar." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Keşif kuralı \"%1$s\" için yanlış koşullar." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "Yanlış korelasyon ID'si." - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "\"%1$s\" eylemi için yanlış özel ifade \"%2$s\": %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "\"%1$s\" korelasyonu için yanlış özel ifade \"%2$s\": %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8796,11 +8728,6 @@ msgstr "\"%1$s\" eylemi için yanlış süzgeç koşul formülü ID'si." msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "\"%1$s\" keşif kuralı için yanlış süzgeç koşul formülü ID'si." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "\"%1$s\" korelasyonu için yanlış süzgeç koşul formülü ID'si verildi." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8908,7 +8835,7 @@ msgstr "Yanlış harita ID'si." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Yanlış yöntem \"%1$s.%2$s\"." @@ -9022,11 +8949,6 @@ msgstr "Yanlış tetikleyici prototipi ifadesi. Tetikleyici prototipi ifade elem msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "\"%1$s\" eylemi için yanlış hesaplama türü." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "\"%1$s\" korelasyonu için yanlış hesaplama türü." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9048,10 +8970,10 @@ msgstr "Harita \"%1$s\" için yanlış kullanıcı ID'si belirtildi." msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "Harita \"%1$s\" için yanlış kullanıcı grubu ID'si belirtildi." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9113,18 +9035,6 @@ msgstr "\"%2$s\" tamsayı alanı için yanlış değer \"%1$s\"." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "\"%2$s\" işaretsiz tamsayı alanı için yanlış değer \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "\"%3$s\" korelasyonu için \"%2$s\" alanında yanlış değer \"%1$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9186,12 +9096,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9303,7 +9207,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9314,9 +9218,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9467,7 +9371,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Ekle" @@ -9595,7 +9499,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Zaman aralığı" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9618,7 +9522,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "Geçersiz eylem koşulu: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9632,7 +9536,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9679,9 +9583,11 @@ msgstr "Geçersiz yöntem parametreleri." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9721,17 +9627,17 @@ msgstr "Geçersiz yöntem parametreleri." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9739,14 +9645,14 @@ msgstr "Geçersiz yöntem parametreleri." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9754,111 +9660,116 @@ msgstr "Geçersiz yöntem parametreleri." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10069,7 +9980,7 @@ msgstr[1] "Öğeler etkin" msgid "Item in \"not supported\" state" msgstr "\"Desteklenmeyen\" durumundaki öğe" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Öğe seçilmedi" @@ -10248,7 +10159,7 @@ msgstr "Öğeler güncellendi" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10441,7 +10352,7 @@ msgstr "Etiket konumu" msgid "Language" msgstr "Dil" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11042,7 +10953,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11284,7 +11195,7 @@ msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "Görüntülenecek maksimum süre %1$s gün." msgstr[1] "Görüntülenecek maksimum süre %1$s gün." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11309,7 +11220,7 @@ msgstr "Medya" msgid "Media type" msgstr "Medya türü" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Medya türü \"%1$s\" halihazırda mevcut." @@ -11353,7 +11264,7 @@ msgstr "" msgid "Media type updated" msgstr "Medya türü güncellendi" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "\"%1$s\" ID'li medya türü mevcut değil." @@ -11365,7 +11276,7 @@ msgstr "\"%1$s\" ID'li medya türü mevcut değil." msgid "Media types" msgstr "Medya türleri" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11612,7 +11523,7 @@ msgstr[1] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12014,15 +11925,17 @@ msgstr "Yeni pano" msgid "New element" msgstr "Yeni eleman" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "Yeni olay ana makine grubu" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Yeni olay etiket değeri" @@ -12042,7 +11955,7 @@ msgstr "" msgid "New service time" msgstr "Yeni servis zamanı" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12069,7 +11982,7 @@ msgstr "Sonraki adım" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12098,30 +12011,6 @@ msgstr "Sonraki adım" msgid "No" msgstr "Hayır" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "\"%2$s\" korelasyonu için hiçbir \"%1$s\" verilmedi." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "Korelasyon için hiçbir \"%1$s\" verilmedi." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12171,11 +12060,6 @@ msgstr "Hiçbir kimlik doğrulama kullanıcı adı belirtilmedi." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "\"%1$s\" korelasyonu için hiçbir koşul türü belirtilmedi." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12314,17 +12198,46 @@ msgstr "Hiçbir eşleşen bulunmadı" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "\"%1$s\" korelasyonu için verilen herhangi bir işlem türü yok." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Sistem erişimi için izin yok." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12360,10 +12273,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12391,13 +12303,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12417,8 +12334,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12441,24 +12358,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12480,16 +12397,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12545,7 +12462,7 @@ msgstr "Hiçbir tetik tanımlanmamış." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Boole-dışı bayraklar kullanımdan kaldırıldı." @@ -12615,15 +12532,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "\"guest\" kullanıcısı için parola konulmasına izin yok." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12957,15 +12874,16 @@ msgstr "Kapalı" msgid "Ok" msgstr "Tamam" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Eski olay etiketi değeri" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12987,10 +12905,6 @@ msgstr "Bir kere" msgid "One" msgstr "Bir" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Nesnelerden biri, ana makine grubu olmadan bırakıldı." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Yalnızca bir kere" @@ -13000,10 +12914,6 @@ msgstr "Yalnızca bir kere" msgid "One-time downtime" msgstr "Bir kerelik aksama süresi" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Yalnızca Süper Yöneticiler ana makine grupları oluşturabilir." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Yalnızca Zabbix aracısı, SNMPv1, SNMPv2 ve SNMPv3 kontrolleri benzersiz yapılabilir." @@ -13052,10 +12962,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Yalnızca süper yöneticiler korelasyon oluşturabilir." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13064,10 +12970,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Yalnızca süper yöneticiler korelasyonları güncelleyebilir." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Yalnızca etkin ana makinelere atanmış ve etkin öğelere bağımlılığı olan tetikler sayıldı" @@ -13116,7 +13018,7 @@ msgstr "İşlem, işlem yapacak şablona sahip değil." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13125,33 +13027,33 @@ msgstr "" msgid "Operations" msgstr "İşlemler" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "İşlemci" @@ -13560,16 +13462,16 @@ msgstr "" msgid "Parameter" msgstr "Parametre" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "\"%1$s\" parametresi kullanımdan kaldırıldı." @@ -13706,7 +13608,7 @@ msgstr "" msgid "Paste without external links" msgstr "Harici bağlantılar olmadan yapıştır" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13752,7 +13654,7 @@ msgstr "Bir DNS sorgusu gerçekleştirir. Gerekli bilgi türünü içeren karakt #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13885,7 +13787,7 @@ msgstr "Ana makine envanter alanını doldurur" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14205,7 +14107,7 @@ msgstr "Vekil sunucular" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14213,7 +14115,7 @@ msgstr "Vekil sunucular" msgid "Proxy" msgstr "Vekil sunucu" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14223,12 +14125,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "\"%2$s\" ana bilgisayarı için \"%1$s\" vekil sunucusu mevcut değil." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Vekil sunucu \"%1$s\", bulma kuralı \"%2$s\" tarafından kullanılıyor." @@ -14503,7 +14405,7 @@ msgstr "" msgid "Regular expression" msgstr "Düzenli ifade" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14763,7 +14665,7 @@ msgid "Replace dependencies" msgstr "Bağımlılıkları değiştir" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14960,7 +14862,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Sonuç" @@ -15201,7 +15103,7 @@ msgstr "SMTP sunucu bağlantı noktası" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15499,7 +15401,7 @@ msgstr "" msgid "Script" msgstr "Betik" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "\"%1$s\" betiği zaten var." @@ -15613,7 +15515,7 @@ msgid "Security name" msgstr "Güvenlik adı" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15828,11 +15730,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Servis başlangıç zamanı, bitiş zamanında daha önce olmalıdır." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15844,7 +15746,7 @@ msgstr "" msgid "Service times" msgstr "Servis zamanları" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Servis türü" @@ -15857,7 +15759,7 @@ msgstr "" msgid "Service updated" msgstr "Servis güncellendi" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15869,7 +15771,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15887,9 +15789,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Oturum sonlandı, lütfen tekrar oturum açın." @@ -15951,7 +15853,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16797,10 +16699,10 @@ msgstr "\"%1$s\" tablosunda \"%2$s\" adlı alan yok." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Etiket" @@ -16937,7 +16839,7 @@ msgstr "Şablon" msgid "Template \"%1$s\" already exists." msgstr "\"%1$s\" şablonu zaten var." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17021,7 +16923,7 @@ msgstr "\"%1$s\" ile aynı görünür adlı şablon halihazırda mevcut." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17318,7 +17220,7 @@ msgstr "Kadar" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17725,7 +17627,7 @@ msgstr "Tetikleyici güncellendi" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17789,9 +17691,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17801,7 +17703,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17853,7 +17755,7 @@ msgstr "Bilgi türü" msgid "Types" msgstr "Türler" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17924,8 +17826,8 @@ msgstr "URL, \"%1$s\" haritası için hem \"name\" hem de \"url\" alanlarına sa msgid "URLs" msgstr "URL'ler" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18035,21 +17937,23 @@ msgstr "Birim" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Bilinmeyen" @@ -18067,7 +17971,7 @@ msgid "Unknown error" msgstr "Bilinmeyen hata" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Bilinmeyen ana makine öğesi, seçilen ana makinede böyle bir öğe yok" @@ -18206,7 +18110,7 @@ msgstr "Açık" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18340,37 +18244,37 @@ msgstr "Eylemlerde kullanılır" msgid "User" msgstr "Kullanıcı" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "\"%1$s\" kullanıcısı, kullanıcı grubu olmadan bulunamaz." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "\"%1$s\" kullanıcısı \"%2$s\" panosunun sahibidir." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "\"%1$s\" kullanıcısı \"%2$s\" haritasının sahibidir." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "\"%1$s\" kullanıcısı \"%2$s\" eyleminde kullanılıyor." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18392,13 +18296,13 @@ msgstr "Kullanıcı eklendi" msgid "User agent string" msgstr "Kullanıcı aracısı stringi" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Kullanıcı kendini devre dışı bir gruba veya grafik arayüzü erişimi devre dışı olan bir gruba ekleyemez." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18422,27 +18326,27 @@ msgstr[1] "" msgid "User group" msgstr "Kullanıcı grubu" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Kullanıcı grubu \"%1$s\" halihazırda mevcut." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "\"%1$s\" kullanıcı grubu \"%2$s\" eyleminde kullanılıyor." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Kullanıcı grubu \"%1$s\", veritabanı çalışmıyor mesajlarını yapılandırmada kullanılır." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "\"%1$s\" kullanıcı grubu \"%2$s\" betiği içinde kullanılmış." @@ -18476,9 +18380,9 @@ msgstr[1] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "\"%1$s\" ID'li kullanıcı grubu mevcut değil." @@ -18493,7 +18397,7 @@ msgstr "\"%1$s\" ID'li kullanıcı grubu mevcut değil." msgid "User groups" msgstr "Kullanıcı grupları" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Kullanıcının kendisini silmesine izin verilmez." @@ -18528,7 +18432,7 @@ msgstr "Kullanıcı profili" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18547,7 +18451,7 @@ msgstr[1] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18597,12 +18501,12 @@ msgstr "Kullanıcı güncellendi" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "\"%1$s\" ID'li kullanıcı mevcut değil." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18913,14 +18817,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19032,11 +18936,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Herhangi bir Windows performans sayacının değeri. Tam sayı, float, string veya metin döndürür (isteğe bağlı olarak)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19573,7 +19478,7 @@ msgstr "Yıllık" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19630,7 +19535,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19763,11 +19667,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "bir boole bekleniyor" @@ -19775,16 +19679,16 @@ msgstr "bir boole bekleniyor" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "bir karakter string bekleniyor" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19793,37 +19697,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "bir sayı bekleniyor" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "bir sayı çok büyük" @@ -19844,7 +19748,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19852,19 +19756,19 @@ msgstr "" msgid "a time is expected" msgstr "bir zaman bekleniyor" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "bir zaman periyodu bekleniyor" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19914,7 +19818,7 @@ msgstr "hepsi" msgid "all media" msgstr "bütün medyalar" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19936,23 +19840,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "bir dizi bekleniyor" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "bir dizi veya bir string bekleniyor" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19962,7 +19866,7 @@ msgid "an empty string is expected" msgstr "boş bir string bekleniyor" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "çift sayıda onaltılık karakter bekleniyor" @@ -19970,11 +19874,15 @@ msgstr "çift sayıda onaltılık karakter bekleniyor" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20135,13 +20043,7 @@ msgstr "değiştirilemez" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20172,13 +20074,13 @@ msgstr "değiştirilemez" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20196,14 +20098,14 @@ msgstr "değiştirilemez" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20276,7 +20178,8 @@ msgid "configure" msgstr "yapılandır" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20367,7 +20270,7 @@ msgstr "azalan" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20389,13 +20292,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20421,7 +20324,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20458,7 +20362,7 @@ msgstr "ifade boş" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20549,7 +20453,7 @@ msgstr "simge" msgid "image" msgstr "resim" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20594,15 +20498,19 @@ msgstr "yanlış eleman sayısı" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "\"%1$s\" yakınında yanlış sözdizimi" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20630,7 +20538,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "yanlış adres aralığı \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "UTF-8'de geçersiz bayt dizisi" @@ -20659,27 +20567,27 @@ msgstr "" msgid "invalid history storage period" msgstr "geçersiz geçmiş depolama süresi" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "geçersiz düzenli ifade" @@ -20707,7 +20615,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "{} içine alınmamış veya hatalı biçimlendirilmiş" @@ -20857,7 +20765,7 @@ msgstr "eşleşmeler" msgid "max" msgstr "maks" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20897,7 +20805,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "minimum uzunluk %1$s karakter" @@ -20924,8 +20832,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20946,8 +20854,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21163,6 +21071,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21208,11 +21120,11 @@ msgstr "" msgid "regular expression" msgstr "düzenli ifade" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21224,15 +21136,15 @@ msgstr "" msgid "right" msgstr "sağ" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21280,7 +21192,7 @@ msgstr "" msgid "short description" msgstr "kısa tanımlama" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21299,15 +21211,15 @@ msgstr "kısa tanımlama" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "boş olmalı" @@ -21323,31 +21235,31 @@ msgstr "simge haritalarını göster" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21355,15 +21267,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21376,7 +21288,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21387,7 +21299,7 @@ msgstr "" msgid "tag" msgstr "etiket" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21396,14 +21308,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "\"%1$s\" şablon ID'si %2$s defa geçti" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21415,20 +21327,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "\"%1$s\" parametresi eksik" @@ -21460,7 +21372,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21468,31 +21380,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21506,7 +21418,7 @@ msgstr "tetikleyici" msgid "trigger does not allow manual closing" msgstr "tetikleyici elle kapatmaya izin vermiyor" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21518,11 +21430,11 @@ msgstr "tetikleyici prototipi başka bir şablona veya ana makineye taşınamaz" msgid "trigger with linkages cannot be moved to another template or host" msgstr "bağlantılara sahip tetikleyici başka bir şablona veya ana makineye taşınamaz" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21531,7 +21443,7 @@ msgstr "" msgid "type here to search" msgstr "aramak için buraya yazın" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21579,11 +21491,12 @@ msgstr "beklenmedik makro sonu" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "beklenmedik parametre \"%1$s\"" @@ -21609,8 +21522,8 @@ msgstr "beklenmedik metin \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21635,6 +21548,10 @@ msgstr "" msgid "unsupported version number" msgstr "desteklenmeyen sürüm numarası" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21692,61 +21609,69 @@ msgstr "\"%1$s\" değeri bulunamadı" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "%1$s değeri halihazırda mevcut" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "değer çok uzun" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21777,15 +21702,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "değer %1$s değerlerinden biri olmalıdır" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21794,7 +21717,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21807,11 +21730,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/uk/LC_MESSAGES/frontend.po b/ui/locale/uk/LC_MESSAGES/frontend.po index 9d7cab8aced..e8e9dd21da2 100644 --- a/ui/locale/uk/LC_MESSAGES/frontend.po +++ b/ui/locale/uk/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2016-02-09 16:27+0300\n" "Last-Translator: Oleksii <oleksii.zagorskyi@zabbix.com>\n" "Language-Team: Zabbix translation team\n" @@ -520,7 +520,7 @@ msgstr "Підтвердити" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Підтверджено" @@ -619,7 +619,7 @@ msgstr "Дія \"%1$s\" вже існує." msgid "Action \"%1$s\" no operations defined." msgstr "В дії \"%1$s\" не вказано операцій." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -747,7 +747,7 @@ msgstr "Активно до" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -758,7 +758,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -1014,7 +1014,7 @@ msgstr "З віком менше ніж" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1340,7 +1340,7 @@ msgstr "В (час:хвилина)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1349,8 +1349,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1361,6 +1361,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "Принаймні она група вузлів мережі або вузол мережі має бути вибрано." +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1372,7 +1377,7 @@ msgstr "Має бути створено як мінімум один періо msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1458,7 +1463,7 @@ msgstr "Аутентифікація" msgid "Authentication algorithm" msgstr "Алгоритм аутентифікації" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "Невдала аутентийікація: %1$s." @@ -1507,7 +1512,7 @@ msgstr "Авто" msgid "Auto-login" msgstr "Авто-вхід" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Опції авто-вхід та авто-вихід неможливо активувати разом." @@ -1518,7 +1523,7 @@ msgstr "Авто-вихід" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1777,7 +1782,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1812,7 +1817,7 @@ msgstr "Зворотній виклик" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -2019,7 +2024,7 @@ msgstr "Не вдалося прив'язатися до LDAP сервера." msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2145,7 +2150,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Не вдалося видалити внутрішнього користувача Zabbix \"%1$s\", спробуйте відключити цього користувача." @@ -2154,7 +2159,7 @@ msgstr "Не вдалося видалити внутрішнього корис msgid "Cannot delete action" msgstr "Не вдалося видалити дію" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2227,7 +2232,7 @@ msgstr[0] "Не вдалось видалити вузел мережі тому msgstr[1] "Не вдалось видалити вузли мережі тому, що обслуговування \"%1$s\" має містити принаймні один вузел мережі або групу вузлів мережі." msgstr[2] "Не вдалось видалити вузли мережі тому, що обслуговування \"%1$s\" має містити принаймні один вузел мережі або групу вузлів мережі." -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2302,7 +2307,7 @@ msgstr[0] "Не вдалося видалити проксі" msgstr[1] "Не вдалося видалити проксі" msgstr[2] "Не вдалося видалити проксі" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2328,7 +2333,7 @@ msgstr[0] "Не вдалося видалити скрипт" msgstr[1] "Не вдалося видалити скрипти" msgstr[2] "Не вдалося видалити скрипти" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Не вдалося видалити скрипт. Скрипт \"%1$s\" використовується в операції дії \"%2$s\"." @@ -2748,16 +2753,16 @@ msgstr "Не вдалося знайти перетворення значень msgid "Cannot have empty visible template name." msgstr "Видиме ім'я шаблону не може бути пустим." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2771,7 +2776,7 @@ msgstr[0] "Не вдалося імпортувати шаблон \"%1$s\", п msgstr[1] "Не вдалося імпортувати шаблон \"%1$s\", приєднані шаблони \"%2$s\" не існують." msgstr[2] "Не вдалося імпортувати шаблон \"%1$s\", приєднані шаблони \"%2$s\" не існують." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Не вдалося вставити вираз тригера" @@ -2793,7 +2798,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2855,7 +2860,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Не вдалося прочитати відповідь, перевірте з'єднання з Zabbix сервером \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Не вдалось перейменувати гостьового користувача." @@ -2939,7 +2944,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Не вдалося від'єднати і очистити веб сценарії." @@ -2952,7 +2957,7 @@ msgstr "Не вдалося від'єднати шаблон" msgid "Cannot unlink template." msgstr "Не вдалося від'єднати шаблон." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -3014,9 +3019,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Не вдалося оновити виявлений графік." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Не вдалося оновити виявлену групу вузлів мережі." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -3076,9 +3082,7 @@ msgstr "Не вдалося оновити прототип графіку" msgid "Cannot update group" msgstr "Не вдалося оновити групу" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Не вдалося оновити групи для виявленого вузла мережі \"%1$s\"." @@ -3163,12 +3167,12 @@ msgstr "Не вдалося оновити карту мережі" msgid "Cannot update proxy" msgstr "Не вдалося оновити проксі" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Не вдалося оновити проксі для виявленого вузла мережі \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3188,9 +3192,9 @@ msgstr "" msgid "Cannot update script" msgstr "Не вдалося оновити скрипт" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3375,8 +3379,8 @@ msgid "Character string not included" msgstr "Не містить рядок символів" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3552,7 +3556,7 @@ msgstr "Годинник" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3590,13 +3594,13 @@ msgstr "Закрити" msgid "Close expression constructor" msgstr "Закрити конструктор виразу" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Закрити нову подію" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Закрити старі події" @@ -3693,7 +3697,7 @@ msgstr "Стиснення" msgid "Concurrent sessions" msgstr "Одночасні сесії" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3704,11 +3708,6 @@ msgstr "Умова" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "Умова \"%2$s\" не використовується в формулі \"%3$s\" для дії \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "Умова \"%2$s\" не використовується в формулі \"%3$s\" для кореляції \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3724,11 +3723,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "Умову \"%2$s\" яка використовується в формулі \"%3$s\" для дії \"%1$s\" не задано." -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "Умову \"%2$s\", використовувану в формулі \"%3$s\" для кореляції \"%1$s\", не визначено." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3920,7 +3914,7 @@ msgstr "Текст підтвердження" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Вітаємо! Ви успішно встановили веб-інтерфейс Zabbix." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -4122,12 +4116,11 @@ msgstr "Копіювати" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Кореляція" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "Кореляція \"%1$s\" вже існує." @@ -4158,16 +4151,6 @@ msgstr[0] "Кореляцію активовано" msgstr[1] "Кореляції активовано" msgstr[2] "Кореляції активовано" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "У кореляції відсутні параметри: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "Ім'я кореляції не може бути пустим." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Правило кореляції" @@ -4178,8 +4161,8 @@ msgstr "Кореляцію оновлено" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Кількість" @@ -4551,7 +4534,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS ім'я" @@ -4827,8 +4810,8 @@ msgstr "Гру" msgid "December" msgstr "Грудень" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4838,7 +4821,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4935,7 +4918,7 @@ msgstr "Затримується на" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4985,7 +4968,7 @@ msgstr "Видалити та очистити шаблон? (УВАГА: всі msgid "Delete current action?" msgstr "Видалити поточну дію?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Видалити потчну кореляцію?" @@ -5283,7 +5266,7 @@ msgstr "" msgid "Dependencies" msgstr "Залежності" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Залежність" @@ -5291,7 +5274,7 @@ msgstr "Залежність" msgid "Dependent item" msgstr "Залежний елемент даних" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5500,10 +5483,10 @@ msgstr "Дезактивувати вибрані веб сценарії?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5586,7 +5569,7 @@ msgid "Discovery by proxy" msgstr "Виявлення через проксі" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Перевірка виявлення" @@ -5598,7 +5581,7 @@ msgstr "Перевірки виявлення" msgid "Discovery list" msgstr "Список виявлення" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Об'єкт виявлення" @@ -5701,7 +5684,7 @@ msgstr "Правило виявлення оновлено" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5712,7 +5695,7 @@ msgstr "Правила виявлення" msgid "Discovery rules deleted" msgstr "Правила виявлення видалено" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Стан виявлення" @@ -5868,18 +5851,6 @@ msgstr "Креслити" msgid "Draw style" msgstr "Стиль креслення" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "Дублікат \"%1$s\" значення \"%2$s\" в кореляції \"%3$s\"." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Дублікат \"%1$s\" значення \"%2$s\" в кореляції." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5892,11 +5863,6 @@ msgstr "Дублікат значення \"%1$s\" для \"name\" у карти msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -6056,10 +6022,6 @@ msgstr "Пустий файл SSL ключа у веб сценарії \"%1$s\" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "Пустий ID кореляції." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -6086,11 +6048,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "Пустий тип умови фільтру для дії \"%1$s\"." #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6275,7 +6235,7 @@ msgstr "Активувати трапи" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6286,7 +6246,7 @@ msgstr "Активувати трапи" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6329,7 +6289,7 @@ msgid "English (en_US)" msgstr "Англійська (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6404,7 +6364,7 @@ msgid "Event correlation" msgstr "Кореляція подій" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Правила кореляції події" @@ -6439,11 +6399,11 @@ msgstr "Моніторинг журналів подій. Повертає за msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Пара тегів події" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Тип події" @@ -6780,7 +6740,6 @@ msgstr "Поле \"%1$s\" не може бути встановлено в NULL. #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -7148,7 +7107,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Наданий вираз це не макрос" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "Глобальний регулярний вираз \"%1$s\" не існує." @@ -7394,12 +7353,12 @@ msgstr "Сітка" msgid "Group" msgstr "Група" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Групу \"%1$s\" не може бути видалено, так як вона використовується прототипом вузлів мережі." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "Група \"%1$s\" не може бути видалена, так як вона використовується в умові кореляції." @@ -7733,7 +7692,7 @@ msgstr[2] "Вузли мережі" msgid "Host \"%1$s\" already exists." msgstr "Вузел мережі \"%1$s\" вже існує." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7741,7 +7700,7 @@ msgstr "Вузел мережі \"%1$s\" вже існує." msgid "Host \"%1$s\" cannot be without host group." msgstr "Вузел мережі \"%1$s\" не може бути без групи вузлів мережі." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7814,17 +7773,17 @@ msgstr[2] "Вузли мережі активовано" msgid "Host group" msgstr "Група вузлів мережі" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Група вузлів мережі \"%1$s\" вже існує." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Група вузлів мережі \"%1$s\" не може бути видалена, так як вона використовується в глобальному скрипті." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7838,9 +7797,9 @@ msgid "Host group label type" msgstr "Тип ярлика до групи вузлів мережі" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "Група вузлів мережі з ID \"%1$s\" недоступна." @@ -7856,8 +7815,8 @@ msgstr "Група вузлів мережі з ID \"%1$s\" недоступна #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -8045,7 +8004,7 @@ msgstr "Вузел мережі з таким самим видимим імен #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -8133,7 +8092,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP-адрес" @@ -8158,7 +8117,7 @@ msgstr "Діапазон IP \"%1$s\" перевищує ліміт адрес \" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8215,12 +8174,12 @@ msgstr "Виділення іконки" msgid "Icon map" msgstr "Призначення іконок" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Призначення іконок \"%1$s\" не може бути видалено. Використовується в карті мережі \"%2$s\"." @@ -8244,7 +8203,7 @@ msgstr "Призначення іконок оновлено" msgid "Icon mapping" msgstr "Призначення іконок" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "Іконка з ID \"%1$s\" недоступна." @@ -8477,7 +8436,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8490,11 +8449,11 @@ msgstr "Недоступна карта мережі" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "Недоступний шаблон" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "Недоступний тригер" @@ -8706,24 +8665,6 @@ msgstr "Некоректна група користувачів для опер msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Некоректний користувач для операції дії. Користувач не існує або ви не маєте до нього доступу." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8808,20 +8749,11 @@ msgstr "Некоректні умови для дії \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Некоректні умови для правила виявлення \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "Некоректний ID кореляції." - #: 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." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "Некоректний довільний вираз \"%2$s\" для кореляції \"%1$s\": %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8886,11 +8818,6 @@ msgstr "Некоректний ID формули умови фільтру дл msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Некоректний ID формули умови фільтру для правила виявлення \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "Задано некоректний ID формули умови фільтру для кореляції \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8998,7 +8925,7 @@ msgstr "Некоректний ID карти мережі." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Некоректний метод \"%1$s.%2$s\"." @@ -9112,11 +9039,6 @@ msgstr "Некоректний вираз прототипу тригера. Е msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Некоректний тип підрахунку для дії \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "Некоректний тип обчислення для кореляції \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -9138,10 +9060,10 @@ msgstr "Некоректне значення ID користувача вказ msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "Некоректне значення ID групи користувачів вказано для карти мережі \"%1$s\"." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9203,18 +9125,6 @@ msgstr "Значення \"%1$s\" є некоректним для поля ці msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Значення \"%1$s\" є некоректним для поля числа без знаку \"%2$s\"." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "Некоректне значення \"%1$s\" в полі \"%2$s\" для кореляції \"%3$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9276,12 +9186,6 @@ msgstr "Некоректне значення для поля \"%1$s\"." #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9393,7 +9297,7 @@ msgstr "Некоректне значення для поля \"%1$s\"." #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9404,9 +9308,9 @@ msgstr "Некоректне значення для поля \"%1$s\"." #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9557,7 +9461,7 @@ msgstr "Успадковані та теги тригера" msgid "Inherited items" msgstr "Успадковані елементи даних" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Вставити" @@ -9685,7 +9589,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Інтервал" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9708,7 +9612,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "Неправильна умова дії: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9722,7 +9626,7 @@ msgstr "Помилкова дата." msgid "Invalid email address \"%1$s\"." msgstr "Помилкова адреса email \"%1$s\"." -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "Помилкова адреса email у методу повідомлень з ID \"%1$s\"." @@ -9769,9 +9673,11 @@ msgstr "Неправильні параметри методу." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9811,17 +9717,17 @@ msgstr "Неправильні параметри методу." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9829,14 +9735,14 @@ msgstr "Неправильні параметри методу." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9844,111 +9750,116 @@ msgstr "Неправильні параметри методу." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10162,7 +10073,7 @@ msgstr[2] "Елементи даних активовано" msgid "Item in \"not supported\" state" msgstr "Елемент даних в стані \"не підтримується\"" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Елемент даних не вибрано" @@ -10342,7 +10253,7 @@ msgstr "Елементи оновлено" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10535,7 +10446,7 @@ msgstr "Розміщення ярлика" msgid "Language" msgstr "Мова" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -11142,7 +11053,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11385,7 +11296,7 @@ msgstr[0] "Максимальний період часу відображенн msgstr[1] "Максимальний період часу відображення %1$s дні." msgstr[2] "Максимальний період часу відображення %1$s днів." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "Перевищено максимальну довжину email адреси у методу повідомлень з ID \"%1$s\"." @@ -11410,7 +11321,7 @@ msgstr "Метод повідомлення" msgid "Media type" msgstr "Тип засобу передачі" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Метод повідомлень \"%1$s\" вже існує." @@ -11457,7 +11368,7 @@ msgstr "Тест медіа типу успішний." msgid "Media type updated" msgstr "Метод повідомлень оновлено" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "Метод повідомлень з ID \"%1$s\" недоступний." @@ -11469,7 +11380,7 @@ msgstr "Метод повідомлень з ID \"%1$s\" недоступний. msgid "Media types" msgstr "Методи повідомлень" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11721,7 +11632,7 @@ msgstr[2] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -12123,15 +12034,17 @@ msgstr "Нова панель" msgid "New element" msgstr "Новий елемент" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "Група вузлів нової події" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Значення тегу нової події" @@ -12151,7 +12064,7 @@ msgstr "" msgid "New service time" msgstr "Новий період послуги" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12178,7 +12091,7 @@ msgstr "Наступний крок" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -12207,30 +12120,6 @@ msgstr "Наступний крок" msgid "No" msgstr "Ні" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "\"%1$s\" не задано для кореляції \"%2$s\"." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "\"%1$s\" не задано для кореляції." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12280,11 +12169,6 @@ msgstr "Для аутентифікації не вказано ім'я кори msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "Тип умови не задано для кореляції \"%1$s\"." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12423,17 +12307,46 @@ msgstr "Відповідностей не знайдено" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "Тип операції не задано для кореляції \"%1$s\"." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Немає прав доступу до системи." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12469,10 +12382,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12500,13 +12412,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12526,8 +12443,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12550,24 +12467,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12589,16 +12506,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12654,7 +12571,7 @@ msgstr "Тригерів не визначено." msgid "No value" msgstr "Немає значення" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Не логічні атрибути більше не використовуються." @@ -12724,15 +12641,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Забороняється встановлювати пароль для користувача \"гість\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -13066,15 +12983,16 @@ msgstr "Вимкн" msgid "Ok" msgstr "Ок" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Значення тега старої події" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -13096,10 +13014,6 @@ msgstr "Один раз" msgid "One" msgstr "Одна" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Один із об'єктів залишився без групи вузлів мережі." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Одноразово" @@ -13109,10 +13023,6 @@ msgstr "Одноразово" msgid "One-time downtime" msgstr "Однократна недоступність" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Тільки Супер-Адміністратори можуть створювати групи вузлів мережі." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Тільки Zabbix агент, SNMPv1, SNMPv2 та SNMPv3 перевірки можуть бути зроблені унікальними." @@ -13162,10 +13072,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Тільки супер адміністратори можуть створювати кореляції." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "Тільки супер адмін може встановлювати власника панелі." @@ -13174,10 +13080,6 @@ msgstr "Тільки супер адмін може встановлювати msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Тільки супер адміністратори можуть оновлювати кореляції." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Підраховуються тригери тільки у вузлів мережі під спостереженням та які залежать від активних елементів даних" @@ -13226,7 +13128,7 @@ msgstr "Операція не має шаблону для функціонув msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13235,33 +13137,33 @@ msgstr "" msgid "Operations" msgstr "Операції" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Оператор" @@ -13670,16 +13572,16 @@ msgstr "" msgid "Parameter" msgstr "Параметр" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Параметр \"%1$s\" застарів." @@ -13816,7 +13718,7 @@ msgstr "" msgid "Paste without external links" msgstr "Вставити без зовнішніх зв'язків" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13862,7 +13764,7 @@ msgstr "Виконує DNS запит. Повертає рядок символ #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13995,7 +13897,7 @@ msgstr "Заповнює поле інвентарних даних вузла #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14315,7 +14217,7 @@ msgstr "Проксі" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14323,7 +14225,7 @@ msgstr "Проксі" msgid "Proxy" msgstr "Проксі" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14333,12 +14235,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Проксі \"%1$s\" для вузла мережі \"%2$s\" не існує." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "Проксі \"%1$s\" використовується дією \"%2$s\"." -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Проксі \"%1$s\" використовується в правилі виявлення \"%2$s\"." @@ -14614,7 +14516,7 @@ msgstr "Звичайні" msgid "Regular expression" msgstr "Регулярний вираз" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14875,7 +14777,7 @@ msgid "Replace dependencies" msgstr "Замінити залежності" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -15072,7 +14974,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Результат" @@ -15313,7 +15215,7 @@ msgstr "Порт SMTP серверу" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15614,7 +15516,7 @@ msgstr "Межі" msgid "Script" msgstr "Скрипт" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Скрипт \"%1$s\" уже існує." @@ -15729,7 +15631,7 @@ msgid "Security name" msgstr "Ім'я безпеки" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15945,11 +15847,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Час початку послуги має бути меншим за час закінчення." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15961,7 +15863,7 @@ msgstr "" msgid "Service times" msgstr "Періоди послуги" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Тип сервісу" @@ -15974,7 +15876,7 @@ msgstr "" msgid "Service updated" msgstr "Послугу оновлено" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15986,7 +15888,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -16004,9 +15906,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Сесія завершилась, будь-ласка повторно увійдіть в систему." @@ -16068,7 +15970,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16913,10 +16815,10 @@ msgstr "Таблиця \"%1$s\" не має поля з ім'ям \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Тег" @@ -17053,7 +16955,7 @@ msgstr "Шаблон" msgid "Template \"%1$s\" already exists." msgstr "Шаблон \"%1$s\" вже існує." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17137,7 +17039,7 @@ msgstr "Шаблон із цим самим видимим ім'ям \"%1$s\" в #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17436,7 +17338,7 @@ msgstr "До" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17847,7 +17749,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17911,9 +17813,9 @@ msgstr "Необхідно вибрати два елемента карти м #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17923,7 +17825,7 @@ msgstr "Необхідно вибрати два елемента карти м #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17975,7 +17877,7 @@ msgstr "Тип інформації" msgid "Types" msgstr "Типи" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -18046,8 +17948,8 @@ msgstr "URL повинен мати обидва поля \"name\" та \"url\" msgid "URLs" msgstr "URLи" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18157,21 +18059,23 @@ msgstr "Одиниця виміру" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Невідомо" @@ -18189,7 +18093,7 @@ msgid "Unknown error" msgstr "Невідома помилка" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Невідомий елемент даних вузла мережі, немає цього елемента в обраному вузлі" @@ -18329,7 +18233,7 @@ msgstr "Доступний" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18463,37 +18367,37 @@ msgstr "Використовується в діях" msgid "User" msgstr "Користувач" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "Користувач \"%1$s\" не може бути без групи користувачів." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "Користувач \"%1$s\" власник панелі \"%2$s\"." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "Користувач \"%1$s\" є власником карти мережі \"%2$s\"." -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "Користувач \"%1$s\" використовується в дії \"%2$s\"." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18515,13 +18419,13 @@ msgstr "Користувача додано" msgid "User agent string" msgstr "Рядок user agent" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Користувач не може додати сам себе у відключену групу або в групу з відключеним доступом до Веб-інтерфейсу." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18546,27 +18450,27 @@ msgstr[2] "" msgid "User group" msgstr "Група користувачів" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Група користувачів \"%1$s\" вже існує." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "Група користувачів \"%1$s\" використовується в дії \"%2$s\"." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Група користувачів \"%1$s\" використовується в налаштуваннях відправки повідомлень про недоступність бази даних." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Група користувачів \"%1$s\" використовується в скрипті \"%2$s\"." @@ -18602,9 +18506,9 @@ msgstr[2] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "Група користувачів з ID \"%1$s\" недоступна." @@ -18619,7 +18523,7 @@ msgstr "Група користувачів з ID \"%1$s\" недоступна. msgid "User groups" msgstr "Групи користувачів" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Користувачу не дозволено видалити самого себе." @@ -18654,7 +18558,7 @@ msgstr "Профіль користувача" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18674,7 +18578,7 @@ msgstr[2] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18725,12 +18629,12 @@ msgstr "Дані користувача оновлено" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "Користувач з ID \"%1$s\" недоступний." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -19041,14 +18945,14 @@ msgstr "Валідація" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -19160,11 +19064,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Значення любого лічильника продуктивності Windows. Повертає ціле число, дробове число, рядок або текст (в залежності від запиту)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19703,7 +19608,7 @@ msgstr "Щороку" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19760,7 +19665,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19893,11 +19797,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "очікується логічне значення" @@ -19905,16 +19809,16 @@ msgstr "очікується логічне значення" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "очікується рядок символів" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19923,37 +19827,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "очікується макрос низько-рівневого виявлення" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "очікується число" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "число занадто велике" @@ -19974,7 +19878,7 @@ msgstr "очікується відносний час" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19982,19 +19886,19 @@ msgstr "" msgid "a time is expected" msgstr "очікувався час" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "очікується період часу" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -20044,7 +19948,7 @@ msgstr "всі" msgid "all media" msgstr "всі методи повідомлень" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -20066,23 +19970,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "очікується масив" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "очікується масив або рядок символів" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -20092,7 +19996,7 @@ msgid "an empty string is expected" msgstr "очікувався пустий рядок" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "очікується парна кількість шістнадцяткових символів" @@ -20100,11 +20004,15 @@ msgstr "очікується парна кількість шістнадцят msgid "an explicit time is expected" msgstr "очікувався чіткий час" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20265,13 +20173,7 @@ msgstr "неможливо змінити" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20302,13 +20204,13 @@ msgstr "неможливо змінити" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20326,14 +20228,14 @@ msgstr "неможливо змінити" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20406,7 +20308,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "містить" @@ -20497,7 +20400,7 @@ msgstr "за спаданням" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20519,13 +20422,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "не містить" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "не дорівнює" @@ -20551,7 +20454,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20588,7 +20492,7 @@ msgstr "вираз пустий" msgid "failed to parse JSON" msgstr "не вдалося проаналізувати JSON" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20679,7 +20583,7 @@ msgstr "іконка" msgid "image" msgstr "картинка" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20724,15 +20628,19 @@ msgstr "некоректна кількість елементів" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "некоректний синтаксис біля \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20760,7 +20668,7 @@ msgstr "недійсний патерн Prometheus" msgid "invalid address range \"%1$s\"" msgstr "неправильний діапазон адрес \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "помилкова послідовність байт в UTF-8" @@ -20789,27 +20697,27 @@ msgstr "" msgid "invalid history storage period" msgstr "некоректний період зберігання історії" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "некоректне ім'я групи вузлів мережі" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "некоректне ім'я вузла мережі" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "помилковий регулярний вираз" @@ -20837,7 +20745,7 @@ msgstr "більше ніж чи дорівнює" msgid "is less than or equals" msgstr "менше ніж чи дорівнює" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "не обгорнуте в {} або неправильно сформоване" @@ -20987,7 +20895,7 @@ msgstr "співпадає" msgid "max" msgstr "макс." -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -21027,7 +20935,7 @@ msgid "min() - Minimum value for period T" msgstr "max() - Мінімальне значення за період Т" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "мінімальна довжина %1$s символів" @@ -21054,8 +20962,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "мс" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -21076,8 +20984,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "має містити принаймні один макрос низькорівневого виявлення" @@ -21293,6 +21201,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21338,11 +21250,11 @@ msgstr "" msgid "regular expression" msgstr "регулярний вираз" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21354,15 +21266,15 @@ msgstr "" msgid "right" msgstr "справа" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21410,7 +21322,7 @@ msgstr "" msgid "short description" msgstr "короткий опис" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21429,15 +21341,15 @@ msgstr "короткий опис" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "має бути пустим" @@ -21453,31 +21365,31 @@ msgstr "показати призначення іконок" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21485,15 +21397,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "sum() - Сума значень за період Т" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "наданий обліковий запис не унікальний" @@ -21506,7 +21418,7 @@ msgstr "наданий обліковий запис не унікальний" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21517,7 +21429,7 @@ msgstr "наданий обліковий запис не унікальний" msgid "tag" msgstr "тег" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21526,14 +21438,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "шаблон з ID \"%1$s\" передано %2$s разів" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21545,20 +21457,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "параметр \"%1$s\" відсутній" @@ -21590,7 +21502,7 @@ msgstr "третій" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21598,31 +21510,31 @@ msgstr "" msgid "time shift" msgstr "зсув часу" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "time() - Поточний час" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft() - Час досягнення порогу, вирахуваний на основі періоду Т" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21636,7 +21548,7 @@ msgstr "тригер" msgid "trigger does not allow manual closing" msgstr "для тригера не дозволено закриття вручну" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21648,11 +21560,11 @@ msgstr "прототип тригера неможливо перемістит msgid "trigger with linkages cannot be moved to another template or host" msgstr "тригера зв зв'язками неможливо перемістити в другий шаблон або вузел мережі" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21661,7 +21573,7 @@ msgstr "" msgid "type here to search" msgstr "почніть друкувати для пошуку" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21709,11 +21621,12 @@ msgstr "неочікуваний кінець макросу" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "неочікуваний параметр \"%1$s\"" @@ -21739,8 +21652,8 @@ msgstr "неочікуваний текст \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21765,6 +21678,10 @@ msgstr "непідтримуваний суфікс часу" msgid "unsupported version number" msgstr "непідтримуваний номер версії" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21822,61 +21739,71 @@ msgstr "значення \"%1$s\" не знайдено" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "значення %1$s вже існує" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "значення надто довге" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21907,15 +21834,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "значення має бути одне з %1$s" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21924,7 +21849,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21937,11 +21862,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/vi/LC_MESSAGES/frontend.po b/ui/locale/vi/LC_MESSAGES/frontend.po index a44cb3a376a..b44f9b2fea4 100644 --- a/ui/locale/vi/LC_MESSAGES/frontend.po +++ b/ui/locale/vi/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-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2021-03-19 18:15+0300\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -480,7 +480,7 @@ msgstr "Ghi nhận" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "Đã ghi nhận" @@ -579,7 +579,7 @@ msgstr "Hành động \"%1$s\" đã tồn tại." msgid "Action \"%1$s\" no operations defined." msgstr "Hành động \"%1$s\" không có thao tác được định nghĩa." -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -703,7 +703,7 @@ msgstr "Kích hoạt" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -714,7 +714,7 @@ msgstr "Kích hoạt" #: 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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -970,7 +970,7 @@ msgstr "Thời gian ít hơn" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1296,7 +1296,7 @@ msgstr "Tại (giờ: phút)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1305,8 +1305,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1317,6 +1317,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "Ít nhất một nhóm máy chủ hoặc máy chủ phải đượ chọn." +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1328,7 +1333,7 @@ msgstr "Ít nhất một chu kỳ bảo trì phải được thiết lậ msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1414,7 +1419,7 @@ msgstr "Xác thực" msgid "Authentication algorithm" msgstr "Thuật toán xác thực" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "Xác thực lỗi: %1$s." @@ -1463,7 +1468,7 @@ msgstr "Tự động" msgid "Auto-login" msgstr "Tự động đăng nhập" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Tùy chọn đăng nhập tự động hoặc đăng xuất tự động không thể bật cùng một lúc." @@ -1474,7 +1479,7 @@ msgstr "Tự động đăng xuất" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1733,7 +1738,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1768,7 +1773,7 @@ msgstr "Gọi lại" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1973,7 +1978,7 @@ msgstr "Không thể liên kết với máy chủ LDAP." msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2091,7 +2096,7 @@ msgid "Cannot delete API token" msgid_plural "Cannot delete API tokens" msgstr[0] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Không thể xóa người dùng zabbix nội bộ \"%1$s\", thử vô hiệu hóa người dùng nào đó." @@ -2100,7 +2105,7 @@ msgstr "Không thể xóa người dùng zabbix nội bộ \"%1$s\", thư msgid "Cannot delete action" msgstr "Không thể xóa hành động" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2165,7 +2170,7 @@ msgstr[0] "" "Không thể xóa máy chủ bởi vì bảo trì \"%1$s\" phải chứa ít nhất một máy chủ hoặc nhóm máy chủ. \n" "Không thể xóa máy chủ đã chọn bởi vì bảo trì \"%1$s\" phải chứa ít nhất một máy chủ hoặc một nhóm máy chủ." -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2234,7 +2239,7 @@ msgid "Cannot delete proxy" msgid_plural "Cannot delete proxies" msgstr[0] "Không thể xóa proxy" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2254,7 +2259,7 @@ msgid "Cannot delete script" msgid_plural "Cannot delete scripts" msgstr[0] "Không thể xóa tập lệnh" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Không thể xóa các tập lệnh. Tập lệnh \"%1$s\" được sử dụng trong hành động thao tác \"%2$s\"." @@ -2622,16 +2627,16 @@ msgstr "Không thể tìm thấy giá trị sơ đồ \"%1$s\" được s msgid "Cannot have empty visible template name." msgstr "Không thể để trống tên mẫu." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2643,7 +2648,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist. msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist." msgstr[0] "Không thể nhập template \"%1$s\", template được liên kết \"%2$s\" không tồn tại." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "Không thể chèn biểu thức trigger" @@ -2663,7 +2668,7 @@ msgid "Cannot load module at: %1$s." msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2725,7 +2730,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "Không thể đọc các câu trả lời, kiểm tra kết nối với zabbix server \"%1$s\"." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "Không thể đổi tên người dùng khách." @@ -2807,7 +2812,7 @@ msgid "Cannot unblock user" msgid_plural "Cannot unblock users" msgstr[0] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "Không thể ngắt kết nối hoặc xóa các web scenario." @@ -2820,7 +2825,7 @@ msgstr "Không thể ngắt kết nối tempate" msgid "Cannot unlink template." msgstr "Không thể kết nối đến mẫu." -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2882,9 +2887,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "Không thể cập nhật một biểu đồ được phát hiện." -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "Không thể cập nhật một nhóm host được phát hiện." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -2942,9 +2948,7 @@ msgstr "Không thể cập nhật kiểu đồ thị" msgid "Cannot update group" msgstr "Không thể cập nhật nhóm" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Không thể cập nhật các nhóm cho host được phát hiện \"%1$s\"." @@ -3025,12 +3029,12 @@ msgstr "Không thể cập nhật sơ đồ mạng" msgid "Cannot update proxy" msgstr "Không thể cập nhật proxy" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Không thể cập nhật proxy cho host được phát hiện \"%1$s\"." -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3050,9 +3054,9 @@ msgstr "" msgid "Cannot update script" msgstr "Không thể cập nhật script" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3233,8 +3237,8 @@ msgid "Character string not included" msgstr "Chuỗi ký tự không bao gồm" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3410,7 +3414,7 @@ msgstr "Đồng hồ" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3448,13 +3452,13 @@ msgstr "Đóng" msgid "Close expression constructor" msgstr "Đóng hàm tạo biểu thức" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "Đóng sự kiện mới" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "Đóng sự kiện cũ" @@ -3551,7 +3555,7 @@ msgstr "Nén" msgid "Concurrent sessions" msgstr "Các phiên làm việc đồng thời" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3562,11 +3566,6 @@ msgstr "Điều kiện" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "Điều kiện \"%2$s\" không được sử dụng trong công thức \"%3$s\" cho hoạt động \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "Điều kiện \"%2$s\" không được sử dụng trong công thức \"%3$s\" cho liên kết \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3582,11 +3581,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "Điều kiện \"%2$s\" được sử dụng trong công thức \"%3$s\" cho hoạt động \"%1$s\" không xác định" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "Điều kiện \"%2$s\" được sử dụng trong công thức \"%3$s\" cho liên kết \"%1$s\" không xác định." - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3778,7 +3772,7 @@ msgstr "Xác nhận văn bản" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Chúc mừng! Bạn đã cài đặt thành công Zabbix frontend." -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -3980,12 +3974,11 @@ msgstr "Sao chép" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "Liên kết" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "Liên kết \"%1$s\" đã tồn tại." @@ -4010,16 +4003,6 @@ msgid "Correlation enabled" msgid_plural "Correlations enabled" msgstr[0] "Liên kết đã kích hoạt" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "Liên kết bị thiếu tham số: %1$s" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "Tên liên kết không thể để trống." - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "Quy tắc liên kết" @@ -4030,8 +4013,8 @@ msgstr "Liên kết được cập nhật" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "Đếm" @@ -4403,7 +4386,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "TÊN DNS" @@ -4677,8 +4660,8 @@ msgstr "Dec" msgid "December" msgstr "Tháng 12" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4688,7 +4671,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4785,7 +4768,7 @@ msgstr "Trễ bởi" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4835,7 +4818,7 @@ msgstr "Xóa và xóa bỏ hoàn toàn template hay không? (Cảnh báo: msgid "Delete current action?" msgstr "Xóa hành động hiện tại?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "Xóa sự liên kết hiện tại?" @@ -5133,7 +5116,7 @@ msgstr "" msgid "Dependencies" msgstr "Quan hệ phụ thuộc" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "Phụ thuộc" @@ -5141,7 +5124,7 @@ msgstr "Phụ thuộc" msgid "Dependent item" msgstr "Item phụ thuộc" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5350,10 +5333,10 @@ msgstr "Vô hiệu hóa web scenario đã chọn?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5436,7 +5419,7 @@ msgid "Discovery by proxy" msgstr "Phát hiện bởi proxy" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "Kiểm tra phát hiện" @@ -5448,7 +5431,7 @@ msgstr "Các kiểm tra phát hiện" msgid "Discovery list" msgstr "Danh sách phát hiện" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "Đối tượng phát hiện" @@ -5545,7 +5528,7 @@ msgstr "Quy tắc phát hiện đã cập nhật" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5556,7 +5539,7 @@ msgstr "Các quy tắc phát hiện" msgid "Discovery rules deleted" msgstr "Các quy tắc phát hiện đã xóa" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Trạng thái phát hiện" @@ -5712,18 +5695,6 @@ msgstr "vẽ" msgid "Draw style" msgstr "Kiểu dáng thiết kế" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "Tạo bản sao \"%1$s\" giá trị \"%2$s\" cho liên kết\"%3$s\"." - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "Tạo bản sao \"%1$s\" giá trị \"%2$s\" cho liên kết." - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5736,11 +5707,6 @@ msgstr "Tạo bản sao \"tên\" giá trị \"%1$s\" cho sơ đồ." msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5900,10 +5866,6 @@ msgstr "Tệp khóa SSL trống cho web scenario: \"%1$s\"." msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "ID liên kết trống." - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -5930,11 +5892,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6119,7 +6079,7 @@ msgstr "Kích hoạt trap" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6130,7 +6090,7 @@ msgstr "Kích hoạt trap" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6173,7 +6133,7 @@ msgid "English (en_US)" msgstr "English (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6248,7 +6208,7 @@ msgid "Event correlation" msgstr "Liên kết sự kiện" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "Quy tắc liên kết sự kiện" @@ -6283,11 +6243,11 @@ msgstr "Theo dõi log sự kiện. Trả về log" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "Cặp thẻ sự kiện" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "Kiểu sự kiện" @@ -6622,7 +6582,6 @@ msgstr "Trường \"%1$s\" không thể bị thiết lập là NULL." #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -6990,7 +6949,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "Biểu thức đã cho không phải là một macro" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "Biểu thức chính quy toàn cục \"%1$s\" không tồn tại" @@ -7234,12 +7193,12 @@ msgstr "Grid" msgid "Group" msgstr "Nhóm" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Nhóm \"%1$s\" không thể bị xóa, bởi vì nó được sử dụng bởi các kiểu host." -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "Nhóm \"%1$s\" không thể xóa, bởi vì nó được sử dụng trong một điều kiện tương quan." @@ -7569,7 +7528,7 @@ msgstr[0] "Host" msgid "Host \"%1$s\" already exists." msgstr "Host \"%1$s\" đã tồn tại." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7577,7 +7536,7 @@ msgstr "Host \"%1$s\" đã tồn tại." msgid "Host \"%1$s\" cannot be without host group." msgstr "Máy chủ \"%1$s\" không thể không có nhóm máy chủ." -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7646,17 +7605,17 @@ msgstr[0] "Host được kích hoạtCác host được kích hoạt" msgid "Host group" msgstr "Nhóm host" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Nhóm host \"%1$s\" đã tồn tại." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "`Nhóm host \"%1$s\" không thể bị xóa, bởi bị nó được sử dụng trong một tập lệnh toàn cục." -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7670,9 +7629,9 @@ msgid "Host group label type" msgstr "Kiểu nhãn nhóm host" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "Nhóm máy chủ với ID \"%1$s\" không sẵn sàng." @@ -7688,8 +7647,8 @@ msgstr "Nhóm máy chủ với ID \"%1$s\" không sẵn sàng." #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7875,7 +7834,7 @@ msgstr "Host với cùng một tên hiển thị \"%1$s\" đã tồn tại #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -7963,7 +7922,7 @@ msgstr "IP" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "Địa chỉ IP" @@ -7988,7 +7947,7 @@ msgstr "Dải IP \"%1$s\" vượt quá giới hạn địa chỉ \"%2$s\"" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8045,12 +8004,12 @@ msgstr "Biểu tượng tô sáng" msgid "Icon map" msgstr "Biểu tượng bản đồ" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Biểu tượng bản đồ \"%1$s\" không thể bị xóa. Sử dụng trong bản đồ \"%2$s\"." @@ -8074,7 +8033,7 @@ msgstr "Biểu tượng bản đồ được cập nhật" msgid "Icon mapping" msgstr "Vẽ biểu tượng" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "Biểu tượng với ID \"%1$s\" không sẵn sàng." @@ -8303,7 +8262,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8316,11 +8275,11 @@ msgstr "Sơ đồ không thể tiếp cận" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "Mẫu không thể tiếp cận" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "Trigger không thể tiếp cận" @@ -8532,24 +8491,6 @@ msgstr "Thao tác nhóm người dùng action không chính xác. Nhóm n msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Thao tác người dùng action không chính xác. Người dùng không tồn tại hoặc bạn không có quyền truy cập vào người dùng này." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8634,20 +8575,11 @@ msgstr "Điều kiện không chính xác cho hoạt động \"%1$s\"." msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Điều kiện không chính xác cho quy tắc khám phá \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "ID liên kết không chính xác." - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "Biểu thức tự chọn \"%2$s\" không chính xác cho hoạt động \"%1$s\": %3$s." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "Biểu thức tự chọn \"%2$s\" không chính xác cho liên kết \"%1$s\": %3$s." - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8712,11 +8644,6 @@ msgstr "ID công thức điều kiện bộ lọc không chính xác cho hoạt msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "ID công thức điều kiện bộ lọc không chính xác cho quy tắc khám phá \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "ID công thức điều kiện bộ lọc không chính xác cho liên kết \"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8824,7 +8751,7 @@ msgstr "ID sơ đồ không chính xác." #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Phương pháp \"%1$s.%2$s\" không chính xác." @@ -8938,11 +8865,6 @@ msgstr "Biểu thức trigger không chính xác. Các thành phần biểu th msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Loại tính toán không chính xác cho hoạt động \"%1$s\"." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "Loại tính toán không chính xác cho liên kết\"%1$s\"." - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -8964,10 +8886,10 @@ msgstr "ID người dùng không chính xác được chỉ định cho sơ đ msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "ID nhóm người dùng không chính xác được chỉ định cho sơ đồ \"%1$s\"." -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9029,18 +8951,6 @@ msgstr "Giá trị \"%1$s\" không chính xác đối với trường int msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Giá trị \"%1$s\" không chính xác đối với trường unsigned int \"%2$s\". " -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "Giá trị không chính xác \"%1$s\" trong trường \"%2$s\" cho liên kết \"%3$s\"." - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9102,12 +9012,6 @@ msgstr "Giá trị không chính xác cho trường \"%1$s\"." #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9219,7 +9123,7 @@ msgstr "Giá trị không chính xác cho trường \"%1$s\"." #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9230,9 +9134,9 @@ msgstr "Giá trị không chính xác cho trường \"%1$s\"." #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9383,7 +9287,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "Chèn" @@ -9511,7 +9415,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Khoảng thời gian" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9534,7 +9438,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "Điều kiện hoạt động không hợp lệ: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9548,7 +9452,7 @@ msgstr "Ngày kiểm kê." msgid "Invalid email address \"%1$s\"." msgstr "Địa chỉ email không hợp lệ \"%1$s\"." -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "Địa chỉ email không hợp lệ cho loại phương tiện với ID \"%1$s\"." @@ -9595,9 +9499,11 @@ msgstr "Phương pháp tham số không hợp lệ." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9637,17 +9543,17 @@ msgstr "Phương pháp tham số không hợp lệ." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9655,14 +9561,14 @@ msgstr "Phương pháp tham số không hợp lệ." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9670,111 +9576,116 @@ msgstr "Phương pháp tham số không hợp lệ." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -9982,7 +9893,7 @@ msgstr[0] "Item đã được kích hoạtCác item đã được kích h msgid "Item in \"not supported\" state" msgstr "Item trong trạng thái \"không được hỗ trợ\"" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "Item không được lựa chọn" @@ -10160,7 +10071,7 @@ msgstr "Các item được cập nhật" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10353,7 +10264,7 @@ msgstr "Vị trí nhãn" msgid "Language" msgstr "Ngôn ngữ" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -10948,7 +10859,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11189,7 +11100,7 @@ msgid "Maximum time period to display is %1$s day." msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "Chu kỳ thời gian tối đa để hiển thị là %1$s ngày." -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "Tổng chiều dài tối đa của địa chỉ email vượt quá đối với loại phương tiện có ID \"%1$s\"." @@ -11214,7 +11125,7 @@ msgstr "Media" msgid "Media type" msgstr "Loại phương tiện" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Loại phương tiện \"%1$s\" đã tồn tại." @@ -11255,7 +11166,7 @@ msgstr "" msgid "Media type updated" msgstr "Loại phương tiện đã được cập nhật" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "Kiểu phương tiện với ID \"%1$s\" là không sẵn sàng." @@ -11267,7 +11178,7 @@ msgstr "Kiểu phương tiện với ID \"%1$s\" là không sẵn sàng." msgid "Media types" msgstr "Các loại phương tiện" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11509,7 +11420,7 @@ msgstr[0] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -11911,15 +11822,17 @@ msgstr "Bảng điều khiển mới" msgid "New element" msgstr "Phần tử mới" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "Nhóm sự kiện máy chủ mới" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "Giá trị thẻ sự kiện mới" @@ -11939,7 +11852,7 @@ msgstr "" msgid "New service time" msgstr "Thời gian dịch vụ mới" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -11966,7 +11879,7 @@ msgstr "Bước tiếp theo" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -11995,30 +11908,6 @@ msgstr "Bước tiếp theo" msgid "No" msgstr "Không" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "Không có \"%1$s\" cho liên kết \"%2$s\"." - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "Không có \"%1$ s\" cho liên kết." - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12068,11 +11957,6 @@ msgstr "Không quy định xác thực tên người dùng." msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "Không có loại điều kiện cho liên kết \"%1$s\"." - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12211,17 +12095,46 @@ msgstr "Không khớp với kết quả nào " msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "Không có loại hoạt động nào được đưa ra cho liên kết \"%1$s\"." - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "Không có quyền truy cập hệ thống." #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12257,10 +12170,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12288,13 +12200,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12314,8 +12231,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12338,24 +12255,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12377,16 +12294,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12442,7 +12359,7 @@ msgstr "Không xác định được trigger nào." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "Không có cờ boolean bị phản đối." @@ -12512,15 +12429,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "Không được phép đặt lại mật khẩu cho người dùng \"guest\"." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12854,15 +12771,16 @@ msgstr "Off" msgid "Ok" msgstr "Ok" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "Giá trị thẻ sự kiện cũ" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12884,10 +12802,6 @@ msgstr "Một lần" msgid "One" msgstr "Một" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "Một trong các đối tượng rời khỏi một nhóm host." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "Một lần duy nhất" @@ -12897,10 +12811,6 @@ msgstr "Một lần duy nhất" msgid "One-time downtime" msgstr "Một lần downtime" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "Chỉ các Super Admin mới có thể tạo các nhóm host." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Chỉ có Zabbix agent, SNMPv1, SNMPv2 và SNMPv3 có thể được tạo thành duy nhất." @@ -12948,10 +12858,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "Chỉ có siêu quản trị viên mới có thể tạo ra mối liên hệ." - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "Chỉ Siêu Admin mới có thể đăht chủ sở hữu bang điều khiển." @@ -12960,10 +12866,6 @@ msgstr "Chỉ Siêu Admin mới có thể đăht chủ sở hữu bang điều k msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "Chỉ Siêu Admin mới có thể cập nhật liên kết." - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Chỉ các trigger được gán đến các host đã kích hoạt và tùy thuộc vào các item đã kích hoạt mới được tính" @@ -13012,7 +12914,7 @@ msgstr "Thao tác không có template để hoạt động." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13021,33 +12923,33 @@ msgstr "" msgid "Operations" msgstr "Các thao tác" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "Người thao tác" @@ -13456,16 +13358,16 @@ msgstr "" msgid "Parameter" msgstr "Tham số" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Tham số \"%1$s\" được yêu cầu." @@ -13602,7 +13504,7 @@ msgstr "" msgid "Paste without external links" msgstr "Dán mà không cần liên kết bên ngoài" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13648,7 +13550,7 @@ msgstr "Thực hiện một truy vấn DNS. Trả về chuỗi ký tự với lo #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13781,7 +13683,7 @@ msgstr "Gắn linh kiện vào trường host còn lại" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14101,7 +14003,7 @@ msgstr "Proxies" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14109,7 +14011,7 @@ msgstr "Proxies" msgid "Proxy" msgstr "Proxy" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14119,12 +14021,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "Proxy \"%1$s\" cho host \"%2$s\" không tồn tại." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "Proxy \"%1$s\" được sử dụng cho hoạt động \"%2$s\"." -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Proxy \"%1$s\" được sử dụng bởi quy tắc phát hiện \"%2$s\"." @@ -14398,7 +14300,7 @@ msgstr "Chính quy" msgid "Regular expression" msgstr "Biểu thức chính quy" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14657,7 +14559,7 @@ msgid "Replace dependencies" msgstr "Thay thế quan hệ phụ thuộc" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14854,7 +14756,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "Kết quả" @@ -15095,7 +14997,7 @@ msgstr "Cổng máy chủ STMP" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15390,7 +15292,7 @@ msgstr "Phạm vi" msgid "Script" msgstr "Script" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Script \"%1$s\" đã tồn tại." @@ -15503,7 +15405,7 @@ msgid "Security name" msgstr "Tên bảo mật" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15717,11 +15619,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "Thời gian bắt đầu dịch vụ phải ít hơn so với thời gian kết thúc." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15733,7 +15635,7 @@ msgstr "" msgid "Service times" msgstr "Thời gian dịch vụ" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "Kiểu dịch vụ" @@ -15746,7 +15648,7 @@ msgstr "" msgid "Service updated" msgstr "Dịch vụ được cập nhật" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15758,7 +15660,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15776,9 +15678,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "Kết thúc phiên làm việc, hãy đăng nhập lại." @@ -15840,7 +15742,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16685,10 +16587,10 @@ msgstr "Bảng \"%1$s\" Không có trường đươc đặt tên \"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Tag" @@ -16825,7 +16727,7 @@ msgstr "Template" msgid "Template \"%1$s\" already exists." msgstr "template \"%1$s\" đã tồn tại." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -16909,7 +16811,7 @@ msgstr "Template với cùng tên hiển thị \"%1$s\" đã tồn tại. " #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17204,7 +17106,7 @@ msgstr "Cho tới" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17607,7 +17509,7 @@ msgstr "Trigger được cập nhật" #: 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17671,9 +17573,9 @@ msgstr "Hai phần tử sơ đồ nên được chọn" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17683,7 +17585,7 @@ msgstr "Hai phần tử sơ đồ nên được chọn" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17735,7 +17637,7 @@ msgstr "Kiểu thông tin" msgid "Types" msgstr "Các kiểu" -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17806,8 +17708,8 @@ msgstr "URL phải có cả trường \"tên\" và \"url\" cho sơ đồ \"%1$s\ msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -17917,21 +17819,23 @@ msgstr "Đơn vị" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Không rõ" @@ -17949,7 +17853,7 @@ msgid "Unknown error" msgstr "Lỗi không rõ" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "Host item không rõ, không có item trong host được lựa chọn" @@ -18087,7 +17991,7 @@ msgstr "Up" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18221,37 +18125,37 @@ msgstr "Sử dùng trong các action" msgid "User" msgstr "Người dùng" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "Người dùng \"%1$s\" không thể không có nhóm người dùng." -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "Người dùng \"%1$s\" là chủ sở hữu bảng điều khiển \"%2$s\"." -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "Người dùng \"%1$s\" là sở hữu sơ đồ \"%2$s\"" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "Người dùng \"%1$s\" được sử dụng trong hoạt động \"%2$s\"." -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18273,13 +18177,13 @@ msgstr "Người dùng được thêm vào" msgid "User agent string" msgstr "Chuỗi người dùng agent" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Người dùng không thể thêm chính mình vào một nhóm đã bị vô hiệu hóa hoặc một nhóm tiếp cận với giao diện người dùng." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18302,27 +18206,27 @@ msgstr[0] "Người dùng đã bị xóa" msgid "User group" msgstr "Nhóm người dùng" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "Nhóm người dùng \"%1$s\" đã tồn tại." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "Nhóm người dùng \"%1$s\" sử dùn trong hoạt động \"%2$s\"." -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "Nhóm người dùng \"%1$s\" được sử dụng trong cấu hình cho cơ sở dữ liệu tin nhắn không hoạt động." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "Nhóm người dùng \"%1$s\" được sử dụng trong tập lệnh \"%2$s\"." @@ -18354,9 +18258,9 @@ msgstr[0] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "Nhóm người dùng với ID \"%1$s\" không sẵn sàng." @@ -18371,7 +18275,7 @@ msgstr "Nhóm người dùng với ID \"%1$s\" không sẵn sàng." msgid "User groups" msgstr "Các nhóm người dùng" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "Người dùng không được phép xóa chính mình." @@ -18406,7 +18310,7 @@ msgstr "Hồ sơ người dùng" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18424,7 +18328,7 @@ msgstr[0] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18473,12 +18377,12 @@ msgstr "Người dùng được cập nhật" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "Người dùng có ID \"%1$s\" không khả dụng." -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18789,14 +18693,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -18908,11 +18812,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "Giá trị của bất kỳ bộ đếm hiệu suất Windows. Trả về integer, float, string hoặc text (tùy theo yêu cầu)" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19447,7 +19352,7 @@ msgstr "Hàng năm" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19504,7 +19409,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19637,11 +19541,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "Một boolean được mong đợi " @@ -19649,16 +19553,16 @@ msgstr "Một boolean được mong đợi " msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "Chuỗi kí tự được mong đợi " -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19667,37 +19571,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "một số được kì vọng" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "một số là quá lớn" @@ -19718,7 +19622,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19726,19 +19630,19 @@ msgstr "" msgid "a time is expected" msgstr "một thời gian được kì vọng" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "một khoảng thời gian được dự kiến" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: include/validate.inc.php:221 msgid "a time range is expected" msgstr "một khoảng thời gian dự kiến" #: app/controllers/CControllerPopupHttpStep.php:94 #: app/controllers/CControllerPopupLldOperation.php:154 -#: include/classes/validators/CApiInputValidator.php:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19788,7 +19692,7 @@ msgstr "Tất cả" msgid "all media" msgstr "Tất cả media" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19810,23 +19714,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "một mảng được mong đợi" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "một mảng hoặc một chuỗi ký tự được mong đợi" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19836,7 +19740,7 @@ msgid "an empty string is expected" msgstr "một chuỗi trống dự kiến" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "một số lượng chẵn các ký tự thập lục phân được mong đợi" @@ -19844,11 +19748,15 @@ msgstr "một số lượng chẵn các ký tự thập lục phân được mon msgid "an explicit time is expected" msgstr "một thời gian rõ ràng được dự kiến" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20009,13 +19917,7 @@ msgstr "Không thể thay đổi" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20046,13 +19948,13 @@ msgstr "Không thể thay đổi" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20070,14 +19972,14 @@ msgstr "Không thể thay đổi" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20150,7 +20052,8 @@ msgid "configure" msgstr "cấu hình" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "bao gồm" @@ -20241,7 +20144,7 @@ msgstr "giảm dần" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20263,13 +20166,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "Không bao gồm" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "Không bằng" @@ -20295,7 +20198,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20332,7 +20236,7 @@ msgstr "Biểu thức trống" msgid "failed to parse JSON" msgstr "thất bại trong việc phân tích JSON" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20423,7 +20327,7 @@ msgstr "Biểu tượng" msgid "image" msgstr "Hình ảnh" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20468,15 +20372,19 @@ msgstr "số phần tử không chính xác" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "Cú pháp không chính xác khoảng \"%1$s\"" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20504,7 +20412,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "phạm vi địa chỉ không hợp lệ \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "chuỗi byte không hợp lệ trong UTF-8" @@ -20533,27 +20441,27 @@ msgstr "" msgid "invalid history storage period" msgstr "thời gian lưu trữ lịch sử không hợp lệ" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "tên máy chủ không hợp lệ" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "Tên máy chủ không hợp lệ" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "Biểu thức chính quy không hợp lệ" @@ -20581,7 +20489,7 @@ msgstr "lớn hơn hoặc bằng" msgid "is less than or equals" msgstr "nhỏ hơn hoặc bằng" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "không được đính kèm trong {} hoặc không đúng định dạng" @@ -20731,7 +20639,7 @@ msgstr "Khớp với" msgid "max" msgstr "max" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20771,7 +20679,7 @@ msgid "min() - Minimum value for period T" msgstr "min () - Giá trị tối thiểu cho giai đoạn T" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "độ dài tối thiểu là ký tự %1$s" @@ -20798,8 +20706,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "ms" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20820,8 +20728,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "phải chứa ít nhất một macro khám phá cấp thấp" @@ -21037,6 +20945,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21082,11 +20994,11 @@ msgstr "" msgid "regular expression" msgstr "biểu thức chính quy" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21098,15 +21010,15 @@ msgstr "" msgid "right" msgstr "Bên phải " -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21154,7 +21066,7 @@ msgstr "" msgid "short description" msgstr "Mô tả ngắn" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21173,15 +21085,15 @@ msgstr "Mô tả ngắn" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "trống" @@ -21197,31 +21109,31 @@ msgstr "Thiết lập biểu tượng bản đồ hiển thị" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21229,15 +21141,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "tổng() - Tổng giá trị của một khoảng thời gian T" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "thông tin được cung cấp không phải là duy nhất" @@ -21250,7 +21162,7 @@ msgstr "thông tin được cung cấp không phải là duy nhất" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21261,7 +21173,7 @@ msgstr "thông tin được cung cấp không phải là duy nhất" msgid "tag" msgstr "thẻ" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21270,14 +21182,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "ID template \"%1$s\" được thông qua %2$s lần" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21289,20 +21201,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "Tham số \"%1$s\" bị thiếu" @@ -21334,7 +21246,7 @@ msgstr "Thứ ba" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21342,31 +21254,31 @@ msgstr "" msgid "time shift" msgstr "thay đổi thời gian" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "time() - thời gian hiện tại" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft () - Thời gian để đạt ngưỡng ước tính dựa trên khoảng thời gian T" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21380,7 +21292,7 @@ msgstr "trigger" msgid "trigger does not allow manual closing" msgstr "Trigger không cho phép đóng thủ công" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21392,11 +21304,11 @@ msgstr "mẫu trigger không thể được chuyển sang mẫu hoặc máy ch msgid "trigger with linkages cannot be moved to another template or host" msgstr "trigger với các liên kết không thể được chuyển đến một mẫu hoặc máy chủ khác" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21405,7 +21317,7 @@ msgstr "" msgid "type here to search" msgstr "Kiểu cần tìm kiếm" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21453,11 +21365,12 @@ msgstr "kết thúc bất ngờ của macro" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "tham số bất ngờ \"%1$s\"" @@ -21483,8 +21396,8 @@ msgstr "Văn bản bất ngờ \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21509,6 +21422,10 @@ msgstr "" msgid "unsupported version number" msgstr "Số phiên bản không được hỗ trợ" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21566,61 +21483,67 @@ msgstr "Giá trị \"%1$s\" không được tìm thấy" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "Giá trị \"%1$s\" đã tồn tại" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "Giá trị quá dài" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21651,15 +21574,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "giá trị phải là một trong %1$s" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21668,7 +21589,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21681,11 +21602,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/zh_CN/LC_MESSAGES/frontend.po b/ui/locale/zh_CN/LC_MESSAGES/frontend.po index 32c52455f1a..00304d037c7 100644 --- a/ui/locale/zh_CN/LC_MESSAGES/frontend.po +++ b/ui/locale/zh_CN/LC_MESSAGES/frontend.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Zabbix 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2016-05-11 02:08+0300\n" "Last-Translator: 岂几 <tom3000@126.com>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -486,7 +486,7 @@ msgstr "确认" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "已确认" @@ -585,7 +585,7 @@ msgstr "动作 \"%1$s\" 已经存在。" msgid "Action \"%1$s\" no operations defined." msgstr "动作 \"%1$s\" 没有定义操作。" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -709,7 +709,7 @@ msgstr "启用直到" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -720,7 +720,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -976,7 +976,7 @@ msgstr "持续时间小于" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1298,7 +1298,7 @@ msgstr "于(时:分)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1307,8 +1307,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1319,6 +1319,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "至少选择一个主机群组或主机。" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1330,7 +1335,7 @@ msgstr "必须创建至少一个维护期间." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1416,7 +1421,7 @@ msgstr "认证" msgid "Authentication algorithm" msgstr "认证算法" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "验证失败: %1$s" @@ -1465,7 +1470,7 @@ msgstr "自动" msgid "Auto-login" msgstr "自动登录" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "自动登录和自动注销功能不能同时使用。" @@ -1476,7 +1481,7 @@ msgstr "自动注销" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1735,7 +1740,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1770,7 +1775,7 @@ msgstr "回调" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1975,7 +1980,7 @@ msgstr "无法绑定到 LDAP 服务器。" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2093,7 +2098,7 @@ msgid "Cannot delete API token" msgid_plural "Cannot delete API tokens" msgstr[0] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "无法删除Zabbix内部用户 \"%1$s\", 试试停用这个用户." @@ -2102,7 +2107,7 @@ msgstr "无法删除Zabbix内部用户 \"%1$s\", 试试停用这个用户." msgid "Cannot delete action" msgstr "无法删除动作" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2165,7 +2170,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group." msgstr[0] "无法删除主机因为维护 \"%1$s\" 必须包含至少一个主机或一个主机群组。无法删除所选主机因为维护 \"%1$s\" 必须包含至少一个主机或一个主机群组。" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2232,7 +2237,7 @@ msgid "Cannot delete proxy" msgid_plural "Cannot delete proxies" msgstr[0] "无法删除agent代理程序" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2252,7 +2257,7 @@ msgid "Cannot delete script" msgid_plural "Cannot delete scripts" msgstr[0] "无法删除脚本" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "无法删除脚本. 脚本 \"%1$s\" 用于动作操作 \"%2$s\"。" @@ -2620,16 +2625,16 @@ msgstr "无法在\"%4$s\"上找到由自动发现规则 \"%3$s\"上的 \"%2$s\" msgid "Cannot have empty visible template name." msgstr "模板的显示名称不得为空." -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2641,7 +2646,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist. msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist." msgstr[0] "无法导入模板 \"%1$s\",被关联的模板\"%2$s\"不存在." -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "不能插入触发器表达式" @@ -2661,7 +2666,7 @@ msgid "Cannot load module at: %1$s." msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2723,7 +2728,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "不能读取响应, 检查与Zabbix服务器 \"%1$s\" 的连接." -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "无法重新命名访客用户." @@ -2805,7 +2810,7 @@ msgid "Cannot unblock user" msgid_plural "Cannot unblock users" msgstr[0] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "无法断开和清除 Web 场景." @@ -2818,7 +2823,7 @@ msgstr "无法断开与模板的连接" msgid "Cannot unlink template." msgstr "无法断开与模板的连接。" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2880,9 +2885,10 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "无法更新一个被自动发现的数据图" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." -msgstr "无法更新一个被自动发现的主机组." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." +msgstr "" #: include/classes/api/services/CHttpTest.php:514 #, c-format @@ -2940,9 +2946,7 @@ msgstr "无法更新数据图模板" msgid "Cannot update group" msgstr "无法更新群组" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "对于被自动发现的主机\"%1$s\"无法更新其主机组" @@ -3023,12 +3027,12 @@ msgstr "无法更新网络拓扑图" msgid "Cannot update proxy" msgstr "无法更新agent代理程序" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "对于被自动发现的主机 \"%1$s\"无法更新其代理节点" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3048,9 +3052,9 @@ msgstr "" msgid "Cannot update script" msgstr "无法更新脚本" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3231,8 +3235,8 @@ msgid "Character string not included" msgstr "字符串未包含" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3408,7 +3412,7 @@ msgstr "时钟" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3446,13 +3450,13 @@ msgstr "关闭" msgid "Close expression constructor" msgstr "关闭表达式构造器" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "关闭新的事件" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "关闭过去的事件" @@ -3549,7 +3553,7 @@ msgstr "压缩" msgid "Concurrent sessions" msgstr "并发会话" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3560,11 +3564,6 @@ msgstr "条件" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "对于动作\"%1$s\"条件\"%2$s\"不可以应用于计算式\"%3$s\"中" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "在关联\"%1$s\"中，条件\"%2$s\"无法使用公式 \"%3$s\" " - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3580,11 +3579,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "对于动作\"%1$s\"应用于计算式 \"%3$s\"中的\"%2$s\"条件未被定义" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "在关联项 \"%1$s\" 中 条件 \"%2$s\" 在表达式 \"%3$s\"没有被使用" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3776,7 +3770,7 @@ msgstr "确认文字" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "恩！不错zabbix前端已经配置好了！千山万水第一步！加油，少年！" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -3978,12 +3972,11 @@ msgstr "复制" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "相关性" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "关联项 \"%1$s\" 已经存在" @@ -4008,16 +4001,6 @@ msgid "Correlation enabled" msgid_plural "Correlations enabled" msgstr[0] "启用关联项" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "%1$s找不到关联项参数" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "关联项名字不能为空。" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "关联规则" @@ -4028,8 +4011,8 @@ msgstr "关联项已更新" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "计数" @@ -4401,7 +4384,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS名称" @@ -4675,8 +4658,8 @@ msgstr "十二" msgid "December" msgstr "十二" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4686,7 +4669,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4783,7 +4766,7 @@ msgstr "被延迟由于" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4833,7 +4816,7 @@ msgstr "删除并清除模板? (警告: 所有链接的主机将被清除!)" msgid "Delete current action?" msgstr "删除目前的动作?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "删除当前的关联项？" @@ -5131,7 +5114,7 @@ msgstr "" msgid "Dependencies" msgstr "依赖关系" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "依赖" @@ -5139,7 +5122,7 @@ msgstr "依赖" msgid "Dependent item" msgstr "相关项目" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5348,10 +5331,10 @@ msgstr "禁用所选定的web场景？" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5434,7 +5417,7 @@ msgid "Discovery by proxy" msgstr "由agent代理程序自动发现" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "自动发现检查" @@ -5446,7 +5429,7 @@ msgstr "自动发现检查" msgid "Discovery list" msgstr "自动发现清单" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "自动发现物件" @@ -5543,7 +5526,7 @@ msgstr "自动发现规则已更新" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5554,7 +5537,7 @@ msgstr "自动发现规则" msgid "Discovery rules deleted" msgstr "自动发现规则已删除" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "自动发现状态" @@ -5710,18 +5693,6 @@ msgstr "绘制" msgid "Draw style" msgstr "绘图风格" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "复制关联项 \"%3$s\" 中 \"%1$s\" 的值 \"%2$s\" 。" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "在关联项中复制\"%1$s\"的值 \"%2$s\"" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5734,11 +5705,6 @@ msgstr "拓扑图 %1$s 名字重复。" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5898,10 +5864,6 @@ msgstr "场景\"%1$s\"配置了空的SSL证书文件" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "空的关联ID。" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -5928,11 +5890,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6117,7 +6077,7 @@ msgstr "启用trapping" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6128,7 +6088,7 @@ msgstr "启用trapping" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6171,7 +6131,7 @@ msgid "English (en_US)" msgstr "英语(en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6246,7 +6206,7 @@ msgid "Event correlation" msgstr "关联项事件" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "关联项事件规则" @@ -6281,11 +6241,11 @@ msgstr "事件日志监控。返回日志" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "事件标签对" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "事件类型" @@ -6620,7 +6580,6 @@ msgstr "字段 \"%1$s\"不能被设置为空" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -6989,7 +6948,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "此表达式不是宏" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "找不到全局正则表达式 \"%1$s\" 。" @@ -7233,12 +7192,12 @@ msgstr "网格" msgid "Group" msgstr "群组" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "组\"%1$s\" 不可以被删除，因为它正在被主机模板使用" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "\"%1$s\" 组因为他的关联条件无法删除。" @@ -7570,7 +7529,7 @@ msgstr[0] "主机" msgid "Host \"%1$s\" already exists." msgstr "主机 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7578,7 +7537,7 @@ msgstr "主机 \"%1$s\" 已存在." msgid "Host \"%1$s\" cannot be without host group." msgstr "主机 \"%1$s\" 没有设置主机组" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7647,17 +7606,17 @@ msgstr[0] "主机已启用" msgid "Host group" msgstr "主机群组" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "主机群组 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "主机群组“%1$s”不能被删除，因为它被用于全局脚本" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7671,9 +7630,9 @@ msgid "Host group label type" msgstr "主机群组标签类型" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "ID为 \"%1$s\" 主机组不可用。" @@ -7689,8 +7648,8 @@ msgstr "ID为 \"%1$s\" 主机组不可用。" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7876,7 +7835,7 @@ msgstr "显示名称为\"%1$s\" 的主机已经存在" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -7964,7 +7923,7 @@ msgstr "IP地址" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP地址" @@ -7989,7 +7948,7 @@ msgstr "IP范围 \"%1$s\" 超出 \"%2$s\" 地址限制" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8046,12 +8005,12 @@ msgstr "图标高亮" msgid "Icon map" msgstr "图标映射" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "图标映射\"%1$s\"无法被删除. 已用映射\"%2$s\"中." @@ -8075,7 +8034,7 @@ msgstr "图标映射已更新" msgid "Icon mapping" msgstr "图标映射" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "ID为 \"%1$s\" 的图标不可用。" @@ -8304,7 +8263,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8317,11 +8276,11 @@ msgstr "无法访问的拓扑图" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "无法访问的模板" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "无法访问的触发器" @@ -8533,24 +8492,6 @@ msgstr "错误的动作操作用户群组. 用户群组不存在或您没有访 msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "错误的动作操作用户. 用户不存在或您没有访问权." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8635,20 +8576,11 @@ msgstr "动作\"%1$s\"的条件不正确" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "自动发现规则\"%1$s\"的条件不正确." -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "错误的关联项ID。" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "动作\"%1$s\": %3$s自定义的表达式\"%2$s\" 不正确." -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "在关联项\"%1$s\": %3$s中使用了错误的表达式\"%2$s\"。" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8713,11 +8645,6 @@ msgstr "动作\"%1$s\"的过滤器条件计算式ID不正确." msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "自动发现规则\"%1$s\"的条件计算式ID不正确." -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "错误的过滤条件公式给出相关ID \"%1$s\" 。" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8825,7 +8752,7 @@ msgstr "错误的拓扑图ID" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "不正确的方法 \"%1$s.%2$s\"." @@ -8939,11 +8866,6 @@ msgstr "触发器模板表达式错误。触发器表达式元素不应该同时 msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "动作\"%1$s\"的计算类型不正确." -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "\"%1$s\"的关联项计算类型错误。" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -8965,10 +8887,10 @@ msgstr "拓扑图 \"%1$s\" 用户ID错误。" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "拓扑图 \"%1$s\" 用户组ID错误。" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9030,18 +8952,6 @@ msgstr "错误的值\"%1$s\"于整数栏位\"%2$s\"中." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "错误的值\"%1$s\"于无正负的整数栏位\"%2$s\"中." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "在关联项中\"%3$s\"，\"%2$s\"使用了错误的值\"%1$s\"。" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9103,12 +9013,6 @@ msgstr "\"%1$s\" 字段的值不正确。" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9220,7 +9124,7 @@ msgstr "\"%1$s\" 字段的值不正确。" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9231,9 +9135,9 @@ msgstr "\"%1$s\" 字段的值不正确。" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9384,7 +9288,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "插入" @@ -9512,7 +9416,7 @@ msgstr "IE浏览器" msgid "Interval" msgstr "间隔" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9535,7 +9439,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "无效的动作条件：%1$s。" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9549,7 +9453,7 @@ msgstr "无效数据." msgid "Invalid email address \"%1$s\"." msgstr "无效 email 地址 \"%1$s\"。" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "媒介类型 ID: \"%1$s\" 的 email 地址无效。" @@ -9596,9 +9500,11 @@ msgstr "无效的方法参数." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9638,17 +9544,17 @@ msgstr "无效的方法参数." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9656,14 +9562,14 @@ msgstr "无效的方法参数." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9671,111 +9577,116 @@ msgstr "无效的方法参数." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -9983,7 +9894,7 @@ msgstr[0] "监控项目已启用" msgid "Item in \"not supported\" state" msgstr "监控项在“不支持”的状态" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "项目未被选择" @@ -10161,7 +10072,7 @@ msgstr "监控项已更新" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10354,7 +10265,7 @@ msgstr "标签位置" msgid "Language" msgstr "语言" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -10950,7 +10861,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11191,7 +11102,7 @@ msgid "Maximum time period to display is %1$s day." msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "将要显示的最大时间区间是%1$s天" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "email 地址最大长度超出媒体类型 ID: \"%1$s\"。" @@ -11216,7 +11127,7 @@ msgstr "报警媒介" msgid "Media type" msgstr "报警媒介类型" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "媒体类型 \"%1$s\" 已经存在。" @@ -11257,7 +11168,7 @@ msgstr "" msgid "Media type updated" msgstr "报警媒介类型已更新" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "ID为 \"%1$s\" 的媒体类型不可用。" @@ -11269,7 +11180,7 @@ msgstr "ID为 \"%1$s\" 的媒体类型不可用。" msgid "Media types" msgstr "报警媒介类型" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11511,7 +11422,7 @@ msgstr[0] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -11913,15 +11824,17 @@ msgstr "新仪表盘" msgid "New element" msgstr "新的组件" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "新的主机组事件" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "新的事件标记值" @@ -11941,7 +11854,7 @@ msgstr "" msgid "New service time" msgstr "新的服务时间" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -11968,7 +11881,7 @@ msgstr "下一步" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -11997,30 +11910,6 @@ msgstr "下一步" msgid "No" msgstr "不" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "\"%1$s\"没有返回关联项\"%2$s\"。" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "\"%1$s\" 没有返回关联项。" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12070,11 +11959,6 @@ msgstr "没有指定的认证用户名称" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "关联项 \"%1$s\" 没有条件类型" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12213,17 +12097,46 @@ msgstr "没有找到匹配" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "关联项 \"%1$s\" 没有操作类型" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "没有系统访问权限。" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12259,10 +12172,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12290,13 +12202,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12316,8 +12233,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12340,24 +12257,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12379,16 +12296,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12444,7 +12361,7 @@ msgstr "没有已定义的触发器." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "不推荐使用非布尔标志。" @@ -12514,15 +12431,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "不允许设定用户\"guest\"的密码." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12856,15 +12773,16 @@ msgstr "关" msgid "Ok" msgstr "正常" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "过去的时间标签值" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12886,10 +12804,6 @@ msgstr "一次" msgid "One" msgstr "壹" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "其中的一个对象被留下没有主机组." - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "一次性" @@ -12899,10 +12813,6 @@ msgstr "一次性" msgid "One-time downtime" msgstr "单次停机" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "只有超级管理员可以创建主机群组." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "只有Zabbix代理, SNMPv1,SNMPv2 和 SNMPv3检查才是独特的." @@ -12950,10 +12860,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "只有超级管理员才能创建关联项。" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "只有超级管理员才能设置仪表板所有者。" @@ -12962,10 +12868,6 @@ msgstr "只有超级管理员才能设置仪表板所有者。" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "只有超级管理员才能更新关联项。" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "只计算指派给启用的主机的和相依于启用的项目的触发器" @@ -13014,7 +12916,7 @@ msgstr "操作并无模板来操作." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13023,33 +12925,33 @@ msgstr "" msgid "Operations" msgstr "操作" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "操作者" @@ -13458,16 +13360,16 @@ msgstr "" msgid "Parameter" msgstr "参数" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "参数 \"%1$s\" 已被弃用。" @@ -13604,7 +13506,7 @@ msgstr "" msgid "Paste without external links" msgstr "粘贴无外部链接" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13651,7 +13553,7 @@ msgstr "执行DNS查询。返回字符串信息" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13784,7 +13686,7 @@ msgstr "填入主机资产纪录栏位" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14104,7 +14006,7 @@ msgstr "agent代理程序" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14112,7 +14014,7 @@ msgstr "agent代理程序" msgid "Proxy" msgstr "agent代理程序" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14122,12 +14024,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "主机\"%2$s\"的agent代理程序\"%1$s\"不存在." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "代理 \"%1$s\" 已被动作 \"%2$s\" 使用。" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "agent代理程序\"%1$s\"是用在自动发现规则\"%2$s\"上." @@ -14401,7 +14303,7 @@ msgstr "常规" msgid "Regular expression" msgstr "正则表达式" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14660,7 +14562,7 @@ msgid "Replace dependencies" msgstr "替换依赖关系" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14859,7 +14761,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "结果" @@ -15101,7 +15003,7 @@ msgstr "SMTP服务器端口" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15396,7 +15298,7 @@ msgstr "范围" msgid "Script" msgstr "脚本" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "脚本\"%1$s\"已经存在." @@ -15509,7 +15411,7 @@ msgid "Security name" msgstr "安全名称" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15723,11 +15625,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "服务的开始时间不能晚于截止时间." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15739,7 +15641,7 @@ msgstr "" msgid "Service times" msgstr "服务次数" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "服务类型" @@ -15752,7 +15654,7 @@ msgstr "" msgid "Service updated" msgstr "服务已更新" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15764,7 +15666,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15782,9 +15684,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "会话已中断, 请重新登录." @@ -15846,7 +15748,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16691,10 +16593,10 @@ msgstr "表\"%1$s\"不能有栏位名为\"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "标签" @@ -16831,7 +16733,7 @@ msgstr "模板" msgid "Template \"%1$s\" already exists." msgstr "模板 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -16915,7 +16817,7 @@ msgstr "拥有相同显示名称\"%1$s\"的模板已经存在." #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17210,7 +17112,7 @@ msgstr "直到" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17614,7 +17516,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17678,9 +17580,9 @@ msgstr "应选择两个拓扑元素" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17690,7 +17592,7 @@ msgstr "应选择两个拓扑元素" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17742,7 +17644,7 @@ msgstr "信息类型" msgid "Types" msgstr "类型 " -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17813,8 +17715,8 @@ msgstr "拓扑图 \"%1$s\" URL、名称为必填项。" msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -17924,21 +17826,23 @@ msgstr "单位" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "未知的" @@ -17956,7 +17860,7 @@ msgid "Unknown error" msgstr "未知错误" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "未知的主机监控项, 在所选的主机中没有这样的监控项" @@ -18094,7 +17998,7 @@ msgstr "上" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18228,37 +18132,37 @@ msgstr "用于动作中" msgid "User" msgstr "用户" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "用户 \"%1$s\" 不能没有用户组。" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "用户 \"%1$s\" 是仪表板 \"%2$s\" 所有者。" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "拓扑图\"%2$s\"的所有者为\"%1$s\"。" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "用户 \"%1$s\" 用于 \"%2$s\" 操作。" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18280,13 +18184,13 @@ msgstr "添加用户" msgid "User agent string" msgstr "用户代理字符串" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "用户不能将自己加进一个取消的群组或已关闭图形接口访问权的群组." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18309,27 +18213,27 @@ msgstr[0] "用户已删除" msgid "User group" msgstr "用户群组" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "用户组\"%1$s\"已存在." -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "用户组 \"%1$s\" 用于 \"%2$s\" 操作。" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "用户组\"%1$s\"为接收数据库宕机信息而使用." -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "用户群组\"%1$s\"被用于脚本\"%2$s\"." @@ -18361,9 +18265,9 @@ msgstr[0] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "ID为\"%1$s\" 的用户组不可用。" @@ -18378,7 +18282,7 @@ msgstr "ID为\"%1$s\" 的用户组不可用。" msgid "User groups" msgstr "用户群组" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "用户是不允许删除自己" @@ -18413,7 +18317,7 @@ msgstr "用户基本资料" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18431,7 +18335,7 @@ msgstr[0] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18480,12 +18384,12 @@ msgstr "用户已更新" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "ID为 \"%1$s\" 的用户不可用。" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18796,14 +18700,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -18915,11 +18819,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "所有Windows计数器值。返回 整形、浮点、字符串、文本" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19454,7 +19359,7 @@ msgstr "每年" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19511,7 +19416,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19644,11 +19548,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "预先设定的布尔值" @@ -19656,16 +19560,16 @@ msgstr "预先设定的布尔值" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "请在字符串中指定" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19674,37 +19578,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "预先设定的数字" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "数字过大" @@ -19725,7 +19629,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19733,19 +19637,19 @@ msgstr "" msgid "a time is expected" msgstr "a 预计时间" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "预设时间段" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19795,7 +19699,7 @@ msgstr "所有" msgid "all media" msgstr "所有介质" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19817,23 +19721,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "请在阵列中指定" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "预设一个数组或一个字符串" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19843,7 +19747,7 @@ msgid "an empty string is expected" msgstr "请指定一个空字符串" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "预设会出现偶数个十六进制字符" @@ -19851,11 +19755,15 @@ msgstr "预设会出现偶数个十六进制字符" msgid "an explicit time is expected" msgstr "需要一个明确的时间" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20016,13 +19924,7 @@ msgstr "不能变更" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20053,13 +19955,13 @@ msgstr "不能变更" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20077,14 +19979,14 @@ msgstr "不能变更" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20157,7 +20059,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "包含" @@ -20248,7 +20151,7 @@ msgstr "降" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20270,13 +20173,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "不含" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "不等于" @@ -20302,7 +20205,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20339,7 +20243,7 @@ msgstr "表达式为空" msgid "failed to parse JSON" msgstr "无法解析 JSON" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20430,7 +20334,7 @@ msgstr "图标" msgid "image" msgstr "图片" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20475,15 +20379,19 @@ msgstr "错误的元素" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "\"%1$s\"附近语法错误" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20511,7 +20419,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "无效地址范围 \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "UTF-8中无效的字节排序" @@ -20540,27 +20448,27 @@ msgstr "" msgid "invalid history storage period" msgstr "无效的历史数据期间" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "无效的主机群组名称" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "无效的主机名称" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "无效的正则表达式" @@ -20588,7 +20496,7 @@ msgstr "大于等于" msgid "is less than or equals" msgstr "小于等于" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "不包含在{}或格式错误" @@ -20738,7 +20646,7 @@ msgstr "匹配" msgid "max" msgstr "最大" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20778,7 +20686,7 @@ msgid "min() - Minimum value for period T" msgstr "min() - 周期 T 内的最小值" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "最小长度为 %1$s 个字符" @@ -20805,8 +20713,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "毫秒" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20827,8 +20735,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "必须包含至少一个底层发现宏" @@ -21044,6 +20952,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21089,11 +21001,11 @@ msgstr "" msgid "regular expression" msgstr "正则表达式" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21105,15 +21017,15 @@ msgstr "" msgid "right" msgstr "正确" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21161,7 +21073,7 @@ msgstr "" msgid "short description" msgstr "简要描述" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21180,15 +21092,15 @@ msgstr "简要描述" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "可能是空的" @@ -21204,31 +21116,31 @@ msgstr "展示图标映射" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21236,15 +21148,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "sum() - 周期 T 内的值之和" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "提供的凭据不是唯一的" @@ -21257,7 +21169,7 @@ msgstr "提供的凭据不是唯一的" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21268,7 +21180,7 @@ msgstr "提供的凭据不是唯一的" msgid "tag" msgstr "标记" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21277,14 +21189,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "模板ID\"%1$s\"已传送%2$s次" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21296,20 +21208,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "找不到参数 \"%1$s\"" @@ -21341,7 +21253,7 @@ msgstr "第三" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21349,31 +21261,31 @@ msgstr "" msgid "time shift" msgstr "时间偏移" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "time() - 当前时间" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft() - 基于周期 T 内达到阈值的时间估计" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21387,7 +21299,7 @@ msgstr "触发器" msgid "trigger does not allow manual closing" msgstr "触发器不允许手动关闭" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21399,11 +21311,11 @@ msgstr "触发器原型无法移动到另外一个模板或者主机" msgid "trigger with linkages cannot be moved to another template or host" msgstr "触发器原型以及关联项无法移动到另外一个模板或者主机" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21412,7 +21324,7 @@ msgstr "" msgid "type here to search" msgstr "在此输入搜索" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21460,11 +21372,12 @@ msgstr "宏的结束是不正确" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "\"%1$s\" 参数异常" @@ -21490,8 +21403,8 @@ msgstr "异常的文本 \"%1$s\"" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21516,6 +21429,10 @@ msgstr "" msgid "unsupported version number" msgstr "这个版本已经不被支持" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21573,61 +21490,67 @@ msgstr "值 \"%1$s\" 未找到" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "值 %1$s 已存在" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "值过长" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21658,15 +21581,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "值必须是 %1$s 之一" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21675,7 +21596,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21688,11 +21609,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" diff --git a/ui/locale/zh_TW/LC_MESSAGES/frontend.po b/ui/locale/zh_TW/LC_MESSAGES/frontend.po index 6e479a45367..10dffc25c53 100644 --- a/ui/locale/zh_TW/LC_MESSAGES/frontend.po +++ b/ui/locale/zh_TW/LC_MESSAGES/frontend.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Zabbix 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-08 19:55+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2012-11-06 09:39+0300\n" "Last-Translator: Yaochiu <brian.huang@primillet.com>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -483,7 +483,7 @@ msgstr "知悉" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "已知悉" @@ -582,7 +582,7 @@ msgstr "回應作業 \"%1$s\" 已存在。" msgid "Action \"%1$s\" no operations defined." msgstr "回應作業 \"%1$s\" 未定義作業" -#: include/classes/api/services/CRole.php:743 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -706,7 +706,7 @@ msgstr "作用中直到" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -717,7 +717,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:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -973,7 +973,7 @@ msgstr "歷時少於" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1295,7 +1295,7 @@ msgstr "於(時:分)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:469 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1304,8 +1304,8 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1280 +#: include/classes/api/services/CUser.php:614 +#: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "" @@ -1316,6 +1316,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1327,7 +1332,7 @@ msgstr "必須創建至少一個維修期間." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1413,7 +1418,7 @@ msgstr "認證" msgid "Authentication algorithm" msgstr "認證法則" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 #, c-format msgid "Authentication failed: %1$s." msgstr "" @@ -1462,7 +1467,7 @@ msgstr "" msgid "Auto-login" msgstr "自動登入" -#: include/classes/api/services/CUser.php:1006 +#: include/classes/api/services/CUser.php:1012 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "" @@ -1473,7 +1478,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1732,7 +1737,7 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2612 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1767,7 +1772,7 @@ msgstr "回呼" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1972,7 +1977,7 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:774 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" @@ -2090,7 +2095,7 @@ msgid "Cannot delete API token" msgid_plural "Cannot delete API tokens" msgstr[0] "" -#: include/classes/api/services/CUser.php:1251 +#: include/classes/api/services/CUser.php:1257 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "無法刪除Zabbix內部用戶 \"%1$s\", 試試停用那用戶." @@ -2099,7 +2104,7 @@ msgstr "無法刪除Zabbix內部用戶 \"%1$s\", 試試停用那用戶." msgid "Cannot delete action" msgstr "無法删除動作" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2162,7 +2167,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group." msgstr[0] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2229,7 +2234,7 @@ msgid "Cannot delete proxy" msgid_plural "Cannot delete proxies" msgstr[0] "無法刪除系統代理程式" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2249,7 +2254,7 @@ msgid "Cannot delete script" msgid_plural "Cannot delete scripts" msgstr[0] "無法删除脚本" -#: include/classes/api/services/CScript.php:857 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "無法刪除腳本. 腳本 \"%1$s\" 用於動作操作\"%2$s\"." @@ -2619,16 +2624,16 @@ msgstr "" msgid "Cannot have empty visible template name." msgstr "範本的可見名稱不可為空白" -#: include/classes/api/services/CRole.php:572 -#: include/classes/api/services/CRole.php:589 -#: include/classes/api/services/CRole.php:648 -#: include/classes/api/services/CRole.php:665 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:551 -#: include/classes/api/services/CRole.php:627 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2640,7 +2645,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist. msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist." msgstr[0] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "無法插入觸發器表示式" @@ -2660,7 +2665,7 @@ msgid "Cannot load module at: %1$s." msgid_plural "Cannot load modules at: %1$s." msgstr[0] "" -#: include/classes/api/services/CUser.php:1443 +#: include/classes/api/services/CUser.php:1449 msgid "Cannot log out." msgstr "" @@ -2722,7 +2727,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "無法讀取回應，請檢查跟Zabbix主機 \"%1$s\" 的連線" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "無法重新命名訪客用戶." @@ -2804,7 +2809,7 @@ msgid "Cannot unblock user" msgid_plural "Cannot unblock users" msgstr[0] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "" @@ -2817,7 +2822,7 @@ msgstr "無法斷連模板" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2879,8 +2884,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -2939,9 +2945,7 @@ msgstr "" msgid "Cannot update group" msgstr "無法更新群組" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -3022,12 +3026,12 @@ msgstr "無法更新網路拓墣圖" msgid "Cannot update proxy" msgstr "無法更新系統代理程式" -#: include/classes/api/services/CProxy.php:636 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:757 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3047,9 +3051,9 @@ msgstr "" msgid "Cannot update script" msgstr "無法更新脚本" -#: include/classes/api/services/CScript.php:405 -#: include/classes/api/services/CScript.php:418 -#: include/classes/api/services/CScript.php:431 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" @@ -3230,8 +3234,8 @@ msgid "Character string not included" msgstr "字元字串未包含" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3407,7 +3411,7 @@ msgstr "Clock" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3445,13 +3449,13 @@ msgstr "關閉" msgid "Close expression constructor" msgstr "關閉表示式建構" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3548,7 +3552,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3559,11 +3563,6 @@ msgstr "條件" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." @@ -3579,11 +3578,6 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." @@ -3775,7 +3769,7 @@ msgstr "確認文字" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -3977,12 +3971,11 @@ msgstr "複製" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4006,16 +3999,6 @@ msgid "Correlation enabled" msgid_plural "Correlations enabled" msgstr[0] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4026,8 +4009,8 @@ msgstr "" #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "計數" @@ -4399,7 +4382,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS名稱" @@ -4673,8 +4656,8 @@ msgstr "十二" msgid "December" msgstr "十二" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" @@ -4684,7 +4667,7 @@ 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:232 +#: include/hosts.inc.php:1245 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 @@ -4781,7 +4764,7 @@ msgstr "延遲因" #: 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.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4831,7 +4814,7 @@ msgstr "刪除並清除模板? (警告: 所有連結的主機將被清除!)" msgid "Delete current action?" msgstr "刪除目前的動作?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" @@ -5129,7 +5112,7 @@ msgstr "" msgid "Dependencies" msgstr "相依關係" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "相依" @@ -5137,7 +5120,7 @@ msgstr "相依" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5346,10 +5329,10 @@ msgstr "停用選取的網頁檢測？" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 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:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: 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 @@ -5432,7 +5415,7 @@ msgid "Discovery by proxy" msgstr "由系統代理程式探索" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "探索檢查" @@ -5444,7 +5427,7 @@ msgstr "探索檢查" msgid "Discovery list" msgstr "探索清單" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "探索物件" @@ -5541,7 +5524,7 @@ msgstr "探索規則已更新" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 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 @@ -5552,7 +5535,7 @@ msgstr "探索規則" msgid "Discovery rules deleted" msgstr "探索規則已删除" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "探索狀態" @@ -5708,18 +5691,6 @@ msgstr "" msgid "Draw style" msgstr "繪圖風格" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5732,11 +5703,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5896,10 +5862,6 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." @@ -5926,11 +5888,9 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: 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 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 @@ -6115,7 +6075,7 @@ msgstr "" #: 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.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6126,7 +6086,7 @@ msgstr "" #: 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:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6169,7 +6129,7 @@ msgid "English (en_US)" msgstr "英語(en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6244,7 +6204,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6279,11 +6239,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6618,7 +6578,6 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 #: include/classes/validators/CNewValidator.php:86 @@ -6986,7 +6945,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "此表示式不是巨集" -#: include/classes/api/services/CIconMap.php:354 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7230,12 +7189,12 @@ msgstr "網格" msgid "Group" msgstr "群組" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7567,7 +7526,7 @@ msgstr[0] "主機" msgid "Host \"%1$s\" already exists." msgstr "主機 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7575,7 +7534,7 @@ msgstr "主機 \"%1$s\" 已存在." msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7644,17 +7603,17 @@ msgstr[0] "" msgid "Host group" msgstr "主機群組" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "主機群組 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7668,9 +7627,9 @@ msgid "Host group label type" msgstr "主機群組標示類型" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:800 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7686,8 +7645,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: 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:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7873,7 +7832,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 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 @@ -7961,7 +7920,7 @@ msgstr "IP地址" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP地址" @@ -7986,7 +7945,7 @@ msgstr "" #: 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 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8043,12 +8002,12 @@ msgstr "圖示標記" msgid "Icon map" msgstr "圖示對應" -#: include/classes/api/services/CIconMap.php:311 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:545 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "圖示對應\"%1$s\"無法被刪除. 已用於對應\"%2$s\"中." @@ -8072,7 +8031,7 @@ msgstr "圖示對應已更新" msgid "Icon mapping" msgstr "圖示對應" -#: include/classes/api/services/CIconMap.php:397 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8301,7 +8260,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8314,11 +8273,11 @@ msgstr "" #: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8530,24 +8489,6 @@ msgstr "不正確的動作操作用戶群組. 用戶群組不存在或您沒有 msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "不正確的動作操作用戶. 用戶不存在或您沒有存取權." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8632,20 +8573,11 @@ msgstr "" msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." @@ -8710,11 +8642,6 @@ msgstr "" msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." @@ -8822,7 +8749,7 @@ msgstr "" #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1631 +#: include/classes/api/services/CUser.php:1637 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "" @@ -8936,11 +8863,6 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." @@ -8962,10 +8884,10 @@ msgstr "" msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:1524 -#: include/classes/api/services/CUser.php:1538 -#: include/classes/api/services/CUser.php:1573 -#: include/classes/api/services/CUser.php:2037 +#: include/classes/api/services/CUser.php:1530 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:1579 +#: include/classes/api/services/CUser.php:2043 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "" @@ -9027,18 +8949,6 @@ msgstr "不正確的值\"%1$s\"於整數欄位\"%2$s\"中." msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "不正確的值\"%1$s\"於無正負整數欄位\"%2$s\"中." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - #: include/classes/validators/CNewValidator.php:125 #: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 @@ -9100,12 +9010,6 @@ msgstr "" #: 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 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 #: include/classes/api/services/CDiscoveryRule.php:1865 #: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 @@ -9217,7 +9121,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9228,9 +9132,9 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:2115 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9381,7 +9285,7 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "插入" @@ -9509,7 +9413,7 @@ msgstr "IE瀏覽器" msgid "Interval" msgstr "間隔" -#: include/classes/api/services/CRole.php:720 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9532,7 +9436,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9546,7 +9450,7 @@ msgstr "" msgid "Invalid email address \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:928 +#: include/classes/api/services/CUser.php:934 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "" @@ -9593,9 +9497,11 @@ msgstr "無效的方法參數." #: app/controllers/CControllerDashboardUpdate.php:200 #: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 #: include/classes/api/services/CDiscoveryRule.php:1645 #: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDiscoveryRule.php:1678 @@ -9635,17 +9541,17 @@ msgstr "無效的方法參數." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:689 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:706 -#: include/classes/api/services/CProxy.php:744 -#: include/classes/api/services/CProxy.php:761 -#: include/classes/api/services/CProxy.php:774 -#: include/classes/api/services/CProxy.php:780 -#: include/classes/api/services/CProxy.php:789 -#: include/classes/api/services/CProxy.php:801 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9653,14 +9559,14 @@ msgstr "無效的方法參數." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:884 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:902 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUser.php:908 +#: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9668,111 +9574,116 @@ msgstr "無效的方法參數." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:326 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:376 -#: include/classes/validators/CApiInputValidator.php:387 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:525 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:610 -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:649 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:755 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:854 -#: include/classes/validators/CApiInputValidator.php:879 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1004 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1068 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1103 -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1180 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:1312 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1372 -#: include/classes/validators/CApiInputValidator.php:1378 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1416 -#: include/classes/validators/CApiInputValidator.php:1422 -#: include/classes/validators/CApiInputValidator.php:1460 -#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1255 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1447 +#: include/classes/validators/CApiInputValidator.php:1453 #: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1552 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1585 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1614 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1647 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1681 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1717 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1770 -#: include/classes/validators/CApiInputValidator.php:1781 -#: include/classes/validators/CApiInputValidator.php:1814 -#: include/classes/validators/CApiInputValidator.php:1905 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:1995 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2032 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2076 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2156 -#: include/classes/validators/CApiInputValidator.php:2179 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2257 -#: include/classes/validators/CApiInputValidator.php:2267 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2298 -#: include/classes/validators/CApiInputValidator.php:2320 -#: include/classes/validators/CApiInputValidator.php:2340 -#: include/classes/validators/CApiInputValidator.php:2370 -#: include/classes/validators/CApiInputValidator.php:2375 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2418 -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 -#: include/classes/validators/CApiInputValidator.php:2487 -#: include/classes/validators/CApiInputValidator.php:2520 -#: include/classes/validators/CApiInputValidator.php:2527 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2558 -#: include/classes/validators/CApiInputValidator.php:2583 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2618 -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 +#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -9980,7 +9891,7 @@ msgstr[0] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10158,7 +10069,7 @@ msgstr "監控項已更新" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10351,7 +10262,7 @@ msgstr "標示位置" msgid "Language" msgstr "語言" -#: include/classes/api/services/CUser.php:769 +#: include/classes/api/services/CUser.php:775 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "" @@ -10946,7 +10857,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11187,7 +11098,7 @@ msgid "Maximum time period to display is %1$s day." msgid_plural "Maximum time period to display is %1$s days." msgstr[0] "" -#: include/classes/api/services/CUser.php:935 +#: include/classes/api/services/CUser.php:941 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" @@ -11212,7 +11123,7 @@ msgstr "示警媒介" msgid "Media type" msgstr "示警媒介類型" -#: include/classes/api/services/CMediatype.php:396 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11255,7 +11166,7 @@ msgstr "" msgid "Media type updated" msgstr "示警媒介類型已更新" -#: include/classes/api/services/CUser.php:859 +#: include/classes/api/services/CUser.php:865 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "" @@ -11267,7 +11178,7 @@ msgstr "" msgid "Media types" msgstr "示警媒介類型" -#: include/classes/api/services/CMediatype.php:809 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11509,7 +11420,7 @@ msgstr[0] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:696 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -11911,15 +11822,17 @@ msgstr "" msgid "New element" msgstr "新的組件" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -11939,7 +11852,7 @@ msgstr "" msgid "New service time" msgstr "新的服務時間" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -11966,7 +11879,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: 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 @@ -11995,30 +11908,6 @@ msgstr "" msgid "No" msgstr "不" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12068,11 +11957,6 @@ msgstr "沒有指定的認證用戶名稱" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12211,17 +12095,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:2048 +#: include/classes/api/services/CUser.php:1550 +#: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "沒有系統存取的許可權" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12257,10 +12170,9 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 @@ -12288,13 +12200,18 @@ msgstr "" #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12314,8 +12231,8 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:267 -#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 #: include/classes/api/services/CImage.php:361 #: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 @@ -12338,24 +12255,24 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:353 -#: include/classes/api/services/CMediatype.php:799 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:630 -#: include/classes/api/services/CProxy.php:857 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:368 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:363 -#: include/classes/api/services/CScript.php:842 -#: include/classes/api/services/CScript.php:902 -#: include/classes/api/services/CScript.php:919 -#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 #: include/classes/api/services/CService.php:410 #: include/classes/api/services/CService.php:475 #: include/classes/api/services/CService.php:895 @@ -12377,16 +12294,16 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 #: include/classes/api/services/CUserMacro.php:345 #: include/classes/api/services/CUserMacro.php:450 #: include/classes/api/services/CUserMacro.php:537 #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 -#: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1239 -#: include/classes/api/services/CUser.php:1767 +#: include/classes/api/services/CUser.php:548 +#: include/classes/api/services/CUser.php:1245 +#: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 @@ -12442,7 +12359,7 @@ msgstr "沒有已定義的觸發器." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1029 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12512,15 +12429,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "不允許設定用戶\"guest\"的密碼." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12854,15 +12771,16 @@ msgstr "關" msgid "Ok" msgstr "正常" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" @@ -12884,10 +12802,6 @@ msgstr "一次" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "一次性" @@ -12897,10 +12811,6 @@ msgstr "一次性" msgid "One-time downtime" msgstr " 單次停機" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "只有超級管理員可以創建主機群組." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -12948,10 +12858,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -12960,10 +12866,6 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "只計算指派給啟用的主機的和相依於啟用的項目的觸發器" @@ -13012,7 +12914,7 @@ msgstr "操作並無模板來操作." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13021,33 +12923,33 @@ msgstr "" msgid "Operations" msgstr "操作" -#: app/views/popup.condition.common.php:73 -#: 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:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "操作者" @@ -13456,16 +13358,16 @@ msgstr "" msgid "Parameter" msgstr "参數" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1477 -#: include/classes/validators/CApiInputValidator.php:1099 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 +#: include/classes/api/services/CUser.php:1483 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13602,7 +13504,7 @@ msgstr "" msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13648,7 +13550,7 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: 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/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 @@ -13781,7 +13683,7 @@ msgstr "填入主機資產紀錄欄位" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14101,7 +14003,7 @@ msgstr "系統代理程式" #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: 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 @@ -14109,7 +14011,7 @@ msgstr "系統代理程式" msgid "Proxy" msgstr "系統代理程式" -#: include/classes/api/services/CProxy.php:588 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14119,12 +14021,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "主機\"%2$s\"的系統代理程式\"%1$s\"不存在." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "系統代理程式\"%1$s\"是用在探索規則\"%2$s\"上." @@ -14398,7 +14300,7 @@ msgstr "" msgid "Regular expression" msgstr "正規表示式" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14657,7 +14559,7 @@ msgid "Replace dependencies" msgstr "替換相依關係" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14854,7 +14756,7 @@ msgstr "" #: 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 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "結果" @@ -15095,7 +14997,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15390,7 +15292,7 @@ msgstr "" msgid "Script" msgstr "脚本" -#: include/classes/api/services/CScript.php:1328 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15503,7 +15405,7 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 #: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 @@ -15717,11 +15619,11 @@ msgstr "" msgid "Service start time must be less than end time." msgstr "服務的開始時間不能晚於截止時間." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15733,7 +15635,7 @@ msgstr "" msgid "Service times" msgstr "服務次數" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "服務類型" @@ -15746,7 +15648,7 @@ msgstr "" msgid "Service updated" msgstr "服務已更新" -#: include/classes/api/services/CRole.php:518 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -15758,7 +15660,7 @@ msgstr "" #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 #: include/classes/helpers/CRoleHelper.php:319 msgid "Services" @@ -15776,9 +15678,9 @@ msgstr "" msgid "Session initialization error." msgstr "" -#: include/classes/api/services/CUser.php:1690 -#: include/classes/api/services/CUser.php:1704 -#: include/classes/api/services/CUser.php:1729 +#: include/classes/api/services/CUser.php:1696 +#: include/classes/api/services/CUser.php:1710 +#: include/classes/api/services/CUser.php:1735 msgid "Session terminated, re-login, please." msgstr "連線期已中斷, 請重連." @@ -15840,7 +15742,7 @@ 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:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16685,10 +16587,10 @@ msgstr "資料表\"%1$s\"不能有欄位名為\"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: 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:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "標簽" @@ -16825,7 +16727,7 @@ msgstr "模板" msgid "Template \"%1$s\" already exists." msgstr "模板 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -16909,7 +16811,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 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 @@ -17204,7 +17106,7 @@ msgstr "直到" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17607,7 +17509,7 @@ 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:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 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:195 @@ -17671,9 +17573,9 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 @@ -17683,7 +17585,7 @@ msgstr "" #: 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/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17735,7 +17637,7 @@ msgstr "數據類型" msgid "Types" msgstr "類型 " -#: include/classes/api/services/CRole.php:460 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17806,8 +17708,8 @@ msgstr "" msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2448 -#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -17917,21 +17819,23 @@ msgstr "單位" #: 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:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: 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: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 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 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 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "未知的" @@ -17949,7 +17853,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "未知的主機項目, 在所選的主機中沒有這樣的項目" @@ -18087,7 +17991,7 @@ msgstr "上" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18221,37 +18125,37 @@ msgstr "用於動作中" msgid "User" msgstr "用户" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" -#: include/classes/api/services/CUser.php:1325 +#: include/classes/api/services/CUser.php:1331 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1310 +#: include/classes/api/services/CUser.php:1316 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1348 +#: include/classes/api/services/CUser.php:1354 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "" -#: include/classes/api/services/CUser.php:1356 +#: include/classes/api/services/CUser.php:1362 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUser.php:1296 +#: include/classes/api/services/CUser.php:1302 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUser.php:1369 +#: include/classes/api/services/CUser.php:1375 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "" @@ -18273,13 +18177,13 @@ msgstr "新增用户" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:973 +#: include/classes/api/services/CUserGroup.php:534 +#: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "用戶不能將自己加進一個取消的群組或已取消圖形介面存取權的群組." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:960 +#: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "" @@ -18302,27 +18206,27 @@ msgstr[0] "用户已删除" msgid "User group" msgstr "用户群組" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "用戶群組\"%1$s\"被用於腳本\"%2$s\"." @@ -18354,9 +18258,9 @@ msgstr[0] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:764 -#: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:735 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 +#: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "" @@ -18371,7 +18275,7 @@ msgstr "" msgid "User groups" msgstr "用户群組" -#: include/classes/api/services/CUser.php:1246 +#: include/classes/api/services/CUser.php:1252 msgid "User is not allowed to delete himself." msgstr "用戶是不允許刪除自己" @@ -18406,7 +18310,7 @@ msgstr "用戶基本資料" msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18424,7 +18328,7 @@ msgstr[0] "" msgid "User role updated" msgstr "" -#: include/classes/api/services/CUser.php:790 +#: include/classes/api/services/CUser.php:796 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "" @@ -18473,12 +18377,12 @@ msgstr "用户已更新" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CUser.php:694 +#: include/classes/api/services/CUser.php:700 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "" @@ -18789,14 +18693,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: 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:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 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:263 #: app/views/popup.lldoperation.php:268 @@ -18908,11 +18812,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19447,7 +19352,7 @@ msgstr "每年" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: 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 @@ -19504,7 +19409,6 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 #: include/classes/api/services/CMaintenance.php:535 @@ -19637,11 +19541,11 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1004 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" @@ -19649,16 +19553,16 @@ msgstr "" msgid "a boolean value is expected" msgstr "" -#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19667,37 +19571,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CApiInputValidator.php:430 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:958 -#: include/classes/validators/CApiInputValidator.php:1472 -#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:615 -#: include/classes/validators/CApiInputValidator.php:654 -#: include/classes/validators/CApiInputValidator.php:968 -#: include/classes/validators/CApiInputValidator.php:1481 -#: include/classes/validators/CApiInputValidator.php:1488 -#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19718,7 +19622,7 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" @@ -19726,19 +19630,19 @@ msgstr "" msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1756 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1722 #: 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:1770 +#: include/classes/validators/CApiInputValidator.php:1845 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 @@ -19788,7 +19692,7 @@ msgstr "所有" msgid "all media" msgstr "所有媒體" -#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19810,23 +19714,23 @@ msgstr "" #: include/classes/import/validators/C60XmlValidator.php:2479 #: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:563 -#: include/classes/validators/CApiInputValidator.php:695 -#: include/classes/validators/CApiInputValidator.php:793 -#: include/classes/validators/CApiInputValidator.php:912 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1263 -#: include/classes/validators/CApiInputValidator.php:1307 -#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1148 -#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19836,7 +19740,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1181 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -19844,11 +19748,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20009,13 +19917,7 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 +#: include/classes/api/services/CAutoregistration.php:163 #: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 @@ -20046,13 +19948,13 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CProxy.php:707 -#: include/classes/api/services/CProxy.php:781 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:753 -#: include/classes/api/services/CUser.php:913 +#: include/classes/api/services/CUserGroup.php:462 +#: include/classes/api/services/CUser.php:759 +#: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20070,14 +19972,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:336 -#: include/classes/validators/CApiInputValidator.php:568 -#: include/classes/validators/CApiInputValidator.php:700 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:917 -#: include/classes/validators/CApiInputValidator.php:963 -#: include/classes/validators/CApiInputValidator.php:1268 -#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20150,7 +20052,8 @@ 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:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20241,7 +20144,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20263,13 +20166,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20295,7 +20198,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20332,7 +20236,7 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2675 msgid "file format is unsupported" msgstr "" @@ -20423,7 +20327,7 @@ msgstr "圖示" msgid "image" msgstr "圖片" -#: include/classes/validators/CApiInputValidator.php:2584 +#: include/classes/validators/CApiInputValidator.php:2669 #, c-format msgid "image size must be less than %1$s" msgstr "" @@ -20468,15 +20372,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "接近 \"%1$s\\ 處語法錯誤" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20504,7 +20412,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20533,27 +20441,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20581,7 +20489,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20731,7 +20639,7 @@ msgstr "符合的" msgid "max" msgstr "最大" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20771,7 +20679,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20798,8 +20706,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "毫秒" -#: include/classes/validators/CApiInputValidator.php:2443 -#: include/classes/validators/CApiInputValidator.php:2521 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20820,8 +20728,8 @@ msgstr "" msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1379 -#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21037,6 +20945,10 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + #: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" @@ -21082,11 +20994,11 @@ msgstr "" msgid "regular expression" msgstr "正則表示式" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21098,15 +21010,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21154,7 +21066,7 @@ msgstr "" msgid "short description" msgstr "簡述" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21173,15 +21085,15 @@ msgstr "簡述" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CProxy.php:658 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:790 -#: include/classes/api/services/CProxy.php:802 +#: include/classes/api/services/CProxy.php:676 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21197,31 +21109,31 @@ msgstr "展示圖示對應" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21229,15 +21141,15 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" -#: include/classes/api/services/CUser.php:2041 +#: include/classes/api/services/CUser.php:2047 msgid "supplied credentials are not unique" msgstr "" @@ -21250,7 +21162,7 @@ msgstr "" #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 #: app/views/popup.service.edit.php:89 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21261,7 +21173,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21270,14 +21182,14 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "模板ID\"%1$s\"已傳送%2$s次" -#: include/classes/validators/CApiInputValidator.php:2623 +#: include/classes/validators/CApiInputValidator.php:2708 msgid "the last new line feed is missing" msgstr "" #: app/controllers/CControllerDashboardUpdate.php:192 #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 -#: include/classes/api/services/CAutoregistration.php:147 +#: include/classes/api/services/CAutoregistration.php:157 #: include/classes/api/services/CDiscoveryRule.php:1646 #: include/classes/api/services/CDiscoveryRule.php:2007 #: include/classes/api/services/CDiscoveryRule.php:2015 @@ -21289,20 +21201,20 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:690 -#: include/classes/api/services/CProxy.php:701 -#: include/classes/api/services/CProxy.php:775 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1104 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21334,7 +21246,7 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" @@ -21342,31 +21254,31 @@ msgstr "" msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21380,7 +21292,7 @@ msgstr "觸發器" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21392,11 +21304,11 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" @@ -21405,7 +21317,7 @@ msgstr "" msgid "type here to search" msgstr "於此輸入搜尋條件" -#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" @@ -21453,11 +21365,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:890 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1074 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21483,8 +21396,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:745 -#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21509,6 +21422,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21566,61 +21483,67 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1815 -#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:363 -#: include/classes/validators/CApiInputValidator.php:531 -#: include/classes/validators/CApiInputValidator.php:1187 -#: include/classes/validators/CApiInputValidator.php:1317 -#: include/classes/validators/CApiInputValidator.php:1363 -#: include/classes/validators/CApiInputValidator.php:1406 -#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 #: include/classes/validators/CApiInputValidator.php:1535 -#: include/classes/validators/CApiInputValidator.php:1578 -#: include/classes/validators/CApiInputValidator.php:1609 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1674 -#: include/classes/validators/CApiInputValidator.php:1708 -#: include/classes/validators/CApiInputValidator.php:1754 -#: include/classes/validators/CApiInputValidator.php:1990 -#: include/classes/validators/CApiInputValidator.php:2022 -#: include/classes/validators/CApiInputValidator.php:2064 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2145 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2247 -#: include/classes/validators/CApiInputValidator.php:2291 -#: include/classes/validators/CApiInputValidator.php:2411 -#: include/classes/validators/CApiInputValidator.php:2551 -#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" -#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:522 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:519 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" #: include/classes/validators/CNewValidator.php:208 #, c-format @@ -21651,15 +21574,13 @@ msgstr "" #: include/classes/import/validators/C52XmlValidator.php:2567 #: include/classes/import/validators/C54XmlValidator.php:2580 #: include/classes/import/validators/C60XmlValidator.php:2581 -#: include/classes/validators/CApiInputValidator.php:516 -#: include/classes/validators/CApiInputValidator.php:855 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:880 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21668,7 +21589,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21681,11 +21602,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" |