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/zh_CN | |
| parent | 3255a5d1e8a5597aeac9a8fb62319c6ba5c883a0 (diff) | |
.......... [ZBX-1357] automatic translation file sync for trunk
Diffstat (limited to 'ui/locale/zh_CN')
| -rw-r--r-- | ui/locale/zh_CN/LC_MESSAGES/frontend.po | 1373 |
1 files changed, 647 insertions, 726 deletions
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 "" |