Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'ui/locale/zh_CN/LC_MESSAGES/frontend.po')
-rw-r--r--ui/locale/zh_CN/LC_MESSAGES/frontend.po1115
1 files changed, 584 insertions, 531 deletions
diff --git a/ui/locale/zh_CN/LC_MESSAGES/frontend.po b/ui/locale/zh_CN/LC_MESSAGES/frontend.po
index 0e3a62e5d2a..c6c9de03012 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-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2016-05-11 02:08+0300\n"
"Last-Translator: 岂几 <tom3000@126.com>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -291,10 +291,10 @@ msgstr "(0 - 使用默认)"
msgid "(Only super admins can create groups)"
msgstr "(只有超级管理员能创建群组)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(无agent代理程序)"
@@ -442,7 +442,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -511,7 +511,7 @@ msgstr "确认已解决的事件"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -530,11 +530,11 @@ msgstr "确认已解决的事件"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -546,24 +546,24 @@ msgstr "确认已解决的事件"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -581,7 +581,7 @@ msgstr "确认已解决的事件"
msgid "Action"
msgstr "动作"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "动作 \"%1$s\" 已经存在。"
@@ -591,7 +591,7 @@ msgstr "动作 \"%1$s\" 已经存在。"
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "动作已添加"
@@ -600,16 +600,16 @@ msgstr "动作已添加"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "动作已删除"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "激活 禁用激活 禁用"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "激活 启用激活 启用"
@@ -627,7 +627,7 @@ msgstr "动作日志"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "动作已更新"
@@ -674,7 +674,7 @@ msgid "Active till"
msgstr "启用直到"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -733,14 +733,14 @@ msgstr "启用直到"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -756,10 +756,10 @@ msgstr "启用直到"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -771,9 +771,9 @@ msgstr "启用直到"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -791,7 +791,7 @@ msgstr "启用直到"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -836,7 +836,7 @@ msgstr "添加子节点元素"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -861,8 +861,8 @@ msgstr "添加多个拓扑图"
msgid "Add new data set"
msgstr "添加新数据集"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -875,7 +875,7 @@ msgstr "添加新的覆盖"
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1009,7 +1009,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1025,6 +1025,10 @@ msgstr ""
msgid "Alert message"
msgstr "告警消息"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "别名"
@@ -1339,7 +1343,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "必须至少设置一个执行内容。"
@@ -1419,9 +1423,9 @@ msgstr ""
msgid "Authentication"
msgstr "认证"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "认证算法"
@@ -1482,12 +1486,12 @@ msgstr "自动登录和自动注销功能不能同时使用。"
msgid "Auto-logout"
msgstr "自动注销"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "自动地"
@@ -1602,12 +1606,12 @@ msgstr "绑定 DN"
msgid "Bind password"
msgstr "绑定密码"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1813,7 +1817,7 @@ msgstr "不能添加一个非数字监控项 \"%1$s\" 到图表 \"%2$s\"."
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "不可以添加一个非数值型的监控项目 \"%1$s\"到数据图模板\"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "无法添加操作"
@@ -2106,7 +2110,7 @@ msgstr[0] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "无法删除Zabbix内部用户 \"%1$s\", 试试停用这个用户."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "无法删除动作"
@@ -2260,12 +2264,12 @@ msgid "Cannot delete script"
msgid_plural "Cannot delete scripts"
msgstr[0] "无法删除脚本"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "无法删除脚本. 脚本 \"%1$s\" 用于动作操作 \"%2$s\"。"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "无法删除所选的动作"
@@ -2281,7 +2285,7 @@ msgstr[0] "无法删除服务"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "无法删除模板"
@@ -2364,7 +2368,7 @@ msgid "Cannot disable API token"
msgid_plural "Cannot disable API tokens"
msgstr[0] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "无法禁用动作"
@@ -2431,7 +2435,7 @@ msgid "Cannot enable API token"
msgid_plural "Cannot enable API tokens"
msgstr[0] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "无法启用动作"
@@ -2649,7 +2653,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:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "不能插入触发器表达式"
@@ -2826,7 +2830,7 @@ msgstr "无法断开与模板的连接。"
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "不能对动作\"%2$s\"更新\"%1$s\"."
@@ -2892,7 +2896,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "无法更新模板web场景 \"%1$s\": %2$s 。"
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "无法更新动作"
@@ -2951,7 +2955,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "对于被自动发现的主机\"%1$s\"无法更新其主机组"
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "无法更新主机"
@@ -3052,9 +3056,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "无法更新脚本"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3081,7 +3085,7 @@ msgstr "无法更新模板化Web场景的步骤 \"%1$s\": %2$s。"
msgid "Cannot update template"
msgstr "无法更新模板"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3165,14 +3169,14 @@ msgstr "采集所有SNMP traps规则以外的snmptrap[]"
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "证书"
@@ -3190,10 +3194,10 @@ msgctxt "verb"
msgid "Change"
msgstr "更改"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3233,9 +3237,9 @@ msgstr "字符串已包含"
msgid "Character string not included"
msgstr "字符串未包含"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3251,7 +3255,7 @@ msgstr "机架信息。返回字符串"
msgid "Check already exists."
msgstr "检查已存在."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "检查开始于\"%1$s\"的表达式部份."
@@ -3373,8 +3377,8 @@ msgstr "清除历史"
msgid "Clear history and trends"
msgstr "清除历史和趋势"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "清除当无链接时"
@@ -3401,16 +3405,16 @@ msgstr "时钟"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3539,7 +3543,7 @@ msgstr "压缩"
msgid "Concurrent sessions"
msgstr "并发会话"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3811,13 +3815,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "链接"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "从主机连接"
@@ -3825,9 +3829,9 @@ msgstr "从主机连接"
msgid "Connections from proxy"
msgstr "从代理连接"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "连接主机"
@@ -3992,10 +3996,10 @@ msgstr "关联规则"
msgid "Correlation updated"
msgstr "关联项已更新"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "计数"
@@ -4085,7 +4089,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4287,7 +4291,7 @@ msgid "Current value"
msgstr "当前值"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "习惯"
@@ -4529,7 +4533,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4602,11 +4606,11 @@ msgstr "硬件维修过期日期"
msgid "Date HW purchased"
msgstr "硬件购买日期"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "日"
@@ -4647,8 +4651,8 @@ msgstr "十二"
msgid "December"
msgstr "十二"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4658,7 +4662,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:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4789,7 +4793,7 @@ msgstr "删除"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "删除并清除"
@@ -4798,11 +4802,11 @@ msgstr "删除并清除"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "删除并清除所选的模板? (警告: 所有链接的主机将被清除!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "删除并清除模板? (警告: 所有链接的主机将被清除!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "删除目前的动作?"
@@ -4935,7 +4939,7 @@ msgstr "删除所选的群组?"
msgid "Delete selected host groups?"
msgstr "删除所选的主机群组?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "删除所选定的主机模板?"
@@ -5043,7 +5047,7 @@ msgstr "删除所选的用户?"
msgid "Delete selected web scenarios?"
msgstr "删除所选的 web 场景?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "删除模板?"
@@ -5104,7 +5108,7 @@ msgstr ""
msgid "Dependencies"
msgstr "依赖关系"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "依赖"
@@ -5112,7 +5116,7 @@ msgstr "依赖"
msgid "Dependent item"
msgstr "相关项目"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5123,7 +5127,7 @@ msgid "Deployment status"
msgstr "部署状态"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5138,16 +5142,16 @@ msgstr "部署状态"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5159,10 +5163,10 @@ msgstr "描述"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "细节"
@@ -5171,6 +5175,14 @@ msgstr "细节"
msgid "Details of web scenario"
msgstr "网络方案详细信息"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "设备"
@@ -5293,7 +5305,7 @@ msgstr "禁用所选定的web场景?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5320,17 +5332,17 @@ msgstr "禁用所选定的web场景?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: 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:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "停用的"
@@ -5355,7 +5367,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5566,7 +5578,7 @@ msgstr "显示堆叠数据图"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5583,7 +5595,7 @@ msgstr "在 %3$s 中打印 %1$s 到 %2$s "
msgid "Displaying options"
msgstr "显示选项"
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5665,7 +5677,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "下载配置文件"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5729,7 +5741,7 @@ msgstr "用户ID \"%1$s\" 与 \"%2$s\" 冲突"
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "持续时间"
@@ -5759,14 +5771,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6022,7 +6034,7 @@ msgstr "启用trapping"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6060,13 +6072,13 @@ msgstr "启用trapping"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 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:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6082,11 +6094,11 @@ msgstr "已启用"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "加密"
@@ -6162,6 +6174,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "错误: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "事件"
@@ -6729,8 +6745,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "首"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "适合"
@@ -6843,12 +6859,12 @@ msgid "Full"
msgstr "填满"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "全克隆"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "功能"
@@ -6864,7 +6880,7 @@ msgstr "GSM 调制解调器"
msgid "GUI"
msgstr "界面设置"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "图形化界面已经被禁用。"
@@ -7211,7 +7227,7 @@ msgstr "组名"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "组模板不可以基于一个已经被自动发现的主机组\"%1$s\""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "组模板"
@@ -7225,12 +7241,11 @@ msgid "Grouping by"
msgstr "群组化之于"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "群组"
@@ -7450,7 +7465,7 @@ msgstr "历史清除可能会很久。继续吗?"
msgid "History data selection"
msgstr "选择历史数据"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7481,7 +7496,7 @@ msgid "Horizontal align"
msgstr "横向对齐"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7490,7 +7505,7 @@ msgstr "横向对齐"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7501,7 +7516,7 @@ msgstr "横向对齐"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7624,7 +7639,7 @@ msgid "Host group label type"
msgstr "主机群组标签类型"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7643,8 +7658,8 @@ msgstr "ID为 \"%1$s\" 主机组不可用。"
#: app/views/monitoring.web.view.php:50
#: 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:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7694,7 +7709,7 @@ msgstr "主机资产记录概览"
msgid "Host label type"
msgstr "主机标签类型"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "主机宏"
@@ -7706,7 +7721,7 @@ msgstr "主机元数据"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "主机名称"
@@ -7743,7 +7758,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "主机模板已删除"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7765,7 +7780,7 @@ msgstr "显示名称为\"%1$s\"的主机模板已存在于自动发现规则\"%2
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "主机模板"
@@ -7790,7 +7805,7 @@ msgstr "主机时间"
msgid "Host update failed."
msgstr "主机更新失败."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "主机已更新"
@@ -7867,6 +7882,10 @@ msgstr "主机位置"
msgid "Hosts updated"
msgstr "主机已更新"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "时"
@@ -7936,15 +7955,15 @@ msgstr "IP范围"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "IP范围 \"%1$s\" 超出 \"%2$s\" 地址限制"
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8174,7 +8193,7 @@ msgstr "图片"
msgid "Images for all maps will be updated!"
msgstr "所有拓扑图都将被更新!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "立即地"
@@ -8256,7 +8275,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr "无法访问的维护"
@@ -8268,11 +8287,11 @@ msgstr "无法访问的拓扑图"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "无法访问的模板"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "无法访问的触发器"
@@ -8387,7 +8406,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "探索检查存在错误的动作情况."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "探索检查存在错误的动作情况. 探索检查不存在或您没有访问权."
@@ -8395,7 +8414,7 @@ msgstr "探索检查存在错误的动作情况. 探索检查不存在或您没
msgid "Incorrect action condition discovery object."
msgstr "不正确的动作条件发现对象。"
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "不正确的动作条件自动发现规则. 自动发现规则不存在或您不能访问它."
@@ -8407,15 +8426,15 @@ msgstr "错误的动作条件探索状态."
msgid "Incorrect action condition event type."
msgstr "错误的动作条件时间类型."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8424,11 +8443,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "错误的动作条件端口\"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "不正确的动作条件agent代理程序. agent代理程序不存在或您没有存取权."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8436,7 +8455,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "错误的操作条件触发器严重性."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "错误的动作条件触发器. 触发器不存在或您没有访问权."
@@ -8446,11 +8465,11 @@ msgstr "错误的动作条件类型."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "错误的动作操作升级步骤值."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8459,11 +8478,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "在事件源 \"%2$s\" 中有错误的动作类型 \"%1$s\" "
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8763,8 +8782,8 @@ msgstr "模板Web方案步骤计数不正确。"
msgid "Incorrect trigger expression"
msgstr "错误的触发器表达式"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "错误的触发器表达式."
@@ -9162,7 +9181,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "有关服务的信息。返回整数字段表示状态,启动状态;字符串 - 以字段作为显示名,路径,用户; 文本 - 使用字段作为描述; 状态码:0 - 运行,1 - 暂停,2 - 启动挂起,3 - 暂停挂起,4 - 继续挂起,5 - 停止挂起,6 - 停止,7 - 未知,255 - 没有这个服务;启动码:0 - 自动,1 - 自动延迟,2 - 手动, 3 - 禁用,4 - 未知"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9171,11 +9190,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "继承以及主机 宏"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9187,7 +9206,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "继承模板的宏"
@@ -9207,7 +9226,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "插入"
@@ -9266,8 +9285,8 @@ msgstr "当\"%2$s\"上有 \"Use DNS\"属性, IP为\"%1$s\"的接口不能有空
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "IP为\"%1$s\"的接口不能有空白的DNS名称."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9359,7 +9378,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "无效的动作条件:%1$s。"
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9420,10 +9439,10 @@ msgstr "无效的方法参数."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9486,8 +9505,8 @@ 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:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9709,11 +9728,11 @@ msgstr "无效的时间段"
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "资产记录"
@@ -9727,7 +9746,7 @@ msgid "Inventory field"
msgstr "资产纪录栏位"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "资产纪录模式"
@@ -9735,10 +9754,10 @@ msgstr "资产纪录模式"
msgid "Is online?"
msgstr "是否在线?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "发行者"
@@ -9827,7 +9846,7 @@ msgstr[0] "监控项目已启用"
msgid "Item in \"not supported\" state"
msgstr "监控项在“不支持”的状态"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "项目未被选择"
@@ -10273,17 +10292,17 @@ msgstr "上月图形"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "最后一个"
@@ -10361,8 +10380,8 @@ msgstr "修整左边"
msgid "Legend"
msgstr "图例"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10396,8 +10415,8 @@ msgstr "线类型"
msgid "Line width"
msgstr "线高度"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "链接"
@@ -10420,16 +10439,9 @@ msgstr ""
msgid "Link indicators"
msgstr "链接指示器"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "模板链接"
@@ -10445,13 +10457,6 @@ msgstr "链接到模板"
msgid "Linked map"
msgstr "拓扑图链接"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10590,7 +10595,7 @@ msgstr "日志与SNMP采集器不符"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "登录"
@@ -10672,16 +10677,16 @@ msgstr "宏\"%1$s\"已存在于\"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "宏\"%1$s\"已存在."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "宏"
@@ -10780,12 +10785,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "手动的"
@@ -10928,16 +10933,16 @@ msgstr "标记其他"
msgid "Mark selected"
msgstr "标记所选"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "掩码"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -10970,11 +10975,11 @@ msgstr "主要项"
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11202,7 +11207,7 @@ msgstr ""
msgid "Middle"
msgstr "居中"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11303,7 +11308,7 @@ msgstr "缺少图原型项\"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "缺少主机\"%2$s\"的键值 \"%1$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11381,9 +11386,9 @@ msgstr "周一"
msgid "Monitored by"
msgstr "要监控什么"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "由agent代理程序监测"
@@ -11402,6 +11407,7 @@ msgstr "监测"
msgid "Monospace"
msgstr "等宽字体"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "月"
@@ -11514,8 +11520,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11585,11 +11591,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11617,8 +11623,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11639,7 +11645,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -11929,15 +11935,15 @@ msgstr "没有所称的自动发现规则ID"
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "非加密"
@@ -12023,7 +12029,7 @@ msgstr "没有找到匹配"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12060,9 +12066,9 @@ msgstr "没有系统访问权限。"
#: 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/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12101,7 +12107,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12201,11 +12207,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: 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/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12264,7 +12270,7 @@ msgid "No public key file specified."
msgstr "没有指定的公钥文件"
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12285,7 +12291,7 @@ msgid "No target selected."
msgstr "没有已选的目标"
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12434,6 +12440,10 @@ msgstr "警报汇总"
msgid "Notifications"
msgstr "警报"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12520,6 +12530,10 @@ msgstr "VMware 虚拟机的处理器数量,<url>-VMware服务URL,<uuid>-VMware
msgid "Number of rows"
msgstr "行数"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "状态改变次数"
@@ -12695,7 +12709,7 @@ msgid "Off"
msgstr "关"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12742,7 +12756,7 @@ msgstr "壹"
msgid "One time only"
msgstr "一次性"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "单次停机"
@@ -12818,12 +12832,12 @@ msgstr "操作系统信息。返回字符串"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12857,8 +12871,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "操作"
@@ -12893,7 +12907,7 @@ msgstr "操作"
msgid "Operator"
msgstr "操作者"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -12933,19 +12947,19 @@ msgstr "或"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -12975,10 +12989,10 @@ msgstr "或"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13241,10 +13255,10 @@ msgstr "问题"
msgid "PROBLEM event generation mode"
msgstr "问题事件生成模式"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13257,19 +13271,19 @@ msgstr "问题事件生成模式"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "共享密钥(PSK)"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "共享密钥一致性"
@@ -13321,12 +13335,12 @@ msgid "Parameters"
msgstr "参数"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "上层探索规则"
@@ -13381,13 +13395,13 @@ msgid "Passive"
msgstr "被动式"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13395,7 +13409,7 @@ msgstr "被动式"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13448,12 +13462,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "粘贴无外部链接"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
#, fuzzy
msgid "Pause operations for suppressed problems"
msgstr "暂停操作以制止问题"
@@ -13467,7 +13481,7 @@ msgstr "峰值内存使用量:%1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "百分比"
@@ -13491,10 +13505,11 @@ msgstr "百分比线(右)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "执行DNS查询。返回字符串信息"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: 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:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13502,7 +13517,9 @@ msgstr "执行DNS查询。返回字符串信息"
msgid "Period"
msgstr "期间"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13566,11 +13583,11 @@ msgstr "播放声音"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "请检查配置参数。如果无误请按%1$s\" ,如果需要修改请按 \"%2$s\" "
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13656,7 +13673,7 @@ msgstr "发布类型"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13665,7 +13682,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "安装前汇总"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13782,9 +13799,9 @@ msgstr "Private(私人的)"
msgid "Private key file"
msgstr "私钥文件"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "优先权层级"
@@ -14190,7 +14207,7 @@ msgstr "恢复表达式"
msgid "Recovery expression syntax error."
msgstr "恢复表达式语法错误。"
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "恢复操作"
@@ -14320,20 +14337,20 @@ msgstr "远程命令"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14342,10 +14359,10 @@ msgstr "远程命令"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14389,7 +14406,7 @@ msgstr "远程命令"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14472,14 +14489,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14492,8 +14509,8 @@ msgstr "替换"
msgid "Replace dependencies"
msgstr "替换依赖关系"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14696,7 +14713,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "结果"
@@ -15226,7 +15243,7 @@ msgstr "范围"
msgid "Script"
msgstr "脚本"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "脚本\"%1$s\"已经存在."
@@ -15290,6 +15307,15 @@ msgstr "查找式样为空"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "第二个POC手机号码"
@@ -15368,7 +15394,7 @@ msgstr "选择构件"
msgid "Selected"
msgstr "选择的"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "所选的动作已删除"
@@ -15608,6 +15634,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16061,7 +16088,7 @@ msgstr "西班牙语 (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "指定的脚本不存在或您没有对操作命令的权限."
@@ -16096,8 +16123,8 @@ msgstr "标准检测器"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16105,7 +16132,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "开始于"
@@ -16184,7 +16211,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16288,7 +16315,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "名字为\"%1$s\"的步骤已经存在."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16342,12 +16369,12 @@ msgstr "Straight"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16368,10 +16395,10 @@ msgstr "过滤器"
msgid "Subject"
msgstr "主题"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "主体"
@@ -16565,7 +16592,7 @@ msgstr "标记值"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16581,13 +16608,13 @@ msgstr "标记值"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16604,7 +16631,7 @@ msgstr "标记值"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16614,7 +16641,7 @@ msgstr "标记值"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16650,14 +16677,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "模板"
@@ -16701,7 +16726,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "模板已删除"
@@ -16713,11 +16738,11 @@ msgstr "模板群组"
msgid "Template linkage"
msgstr "模板间的关联"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "模板 宏"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "模版名称"
@@ -16752,13 +16777,12 @@ msgstr "拥有相同显示名称\"%1$s\"的模板已经存在."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16767,10 +16791,12 @@ msgstr "拥有相同显示名称\"%1$s\"的模板已经存在."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16781,7 +16807,7 @@ msgstr "模板"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "模板\"%1$s\"自主机\"%2$s\"断连."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -16993,7 +17019,7 @@ msgstr "主题"
msgid "This day last week"
msgstr "上周的这一天"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17031,7 +17057,7 @@ msgstr "本年"
msgid "This year so far"
msgstr "今年到目前为止"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "阀值"
@@ -17064,15 +17090,15 @@ msgstr ""
msgid "Till"
msgstr "直到"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 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
@@ -17110,13 +17136,13 @@ msgstr ""
msgid "Time period"
msgstr "时间期间"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17804,9 +17830,9 @@ msgstr "单位"
#: 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:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "未知的"
@@ -17824,7 +17850,7 @@ msgid "Unknown error"
msgstr "未知错误"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "未知的主机监控项, 在所选的主机中没有这样的监控项"
@@ -17856,16 +17882,16 @@ msgstr "未知的值类型"
msgid "Unlimited"
msgstr "无限"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "取消链接"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "取消链接并清理"
@@ -17960,10 +17986,10 @@ msgstr "上"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -17972,16 +17998,16 @@ msgstr "上"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18010,7 +18036,7 @@ msgstr "更新现有的"
msgid "Update interval"
msgstr "更新间隔"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "更新操作"
@@ -18037,7 +18063,7 @@ msgstr "上传"
msgid "Upper level maps"
msgstr "上层拓扑图"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18220,7 +18246,7 @@ msgstr[0] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18354,15 +18380,15 @@ msgid "User/Recipient"
msgstr "用户/接受者"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "用户名称"
@@ -18676,11 +18702,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18754,14 +18780,14 @@ msgstr "值映射 \"%1$s\"已存在."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "值映射"
@@ -18804,7 +18830,7 @@ msgstr "值: 无数据"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -18904,7 +18930,7 @@ msgstr "虚拟空间大小(以字节计)或百分比(总计)。 返回
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "可见的名称"
@@ -18930,7 +18956,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "警告"
@@ -19036,6 +19062,10 @@ msgstr "三"
msgid "Wednesday"
msgstr "周三"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19308,7 +19338,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "年"
@@ -19368,7 +19399,7 @@ msgstr "\"%1$s\" 欢迎登入."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "您无法选择某些语言, 因为这些语言并未安装在web服务器上。"
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "您还没有登录。"
@@ -19609,11 +19640,11 @@ msgstr "预计时间范围"
msgid "a time unit is expected"
msgstr "预设时间单位"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19708,7 +19739,7 @@ msgstr "预设会出现偶数个十六进制字符"
msgid "an explicit time is expected"
msgstr "需要一个明确的时间"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19752,11 +19783,11 @@ msgstr "成红"
msgid "ascending"
msgstr "上一层"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19770,11 +19801,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr "至少选定一个覆盖选项"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19796,39 +19827,47 @@ msgstr ""
msgid "avg"
msgstr "平均"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg() - 周期 T 内的平均值"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19843,7 +19882,7 @@ msgstr "闪烁"
msgid "both username and password should be either present or empty"
msgstr "用户名和密码都应该存在或为空"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -19885,7 +19924,7 @@ msgstr "不能变更"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -19973,23 +20012,23 @@ msgstr "无法执行 Scroll API 请求,数据可能会被截断"
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change() - 最新值和前一个值的差异"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20016,7 +20055,7 @@ msgstr ""
msgid "comma-separated list"
msgstr "以逗号分隔的列表"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20031,15 +20070,15 @@ msgstr "配置"
msgid "contains"
msgstr "包含"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20047,11 +20086,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count() - 对于周期 T,成功检索的值 V(其满足运算符 O)的数量"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20064,15 +20103,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date() - 当前日期"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth() - 当前是本月的第几天"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek() - 当前是本周的第几天"
@@ -20090,7 +20129,7 @@ msgstr "日"
msgid "default"
msgstr "默认的"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20167,7 +20206,7 @@ msgstr ""
msgid "does not match"
msgstr "不匹配"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20190,11 +20229,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20210,7 +20249,7 @@ msgstr "无法解析 JSON"
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20224,15 +20263,15 @@ msgstr "第一"
msgid "first parameter is expected"
msgstr "第一个参数是预设的"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast() - 基于周期 T 预测下一个 t 秒"
@@ -20240,7 +20279,7 @@ msgstr "forecast() - 基于周期 T 预测下一个 t 秒"
msgid "fourth"
msgstr "第四"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr "fuzzytime() - 监控项值的时间戳和 Zabbix 服务器时间戳之间的差异小于或等于 T 秒(1 - true,0 - false)"
@@ -20314,7 +20353,7 @@ msgstr "在"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20323,11 +20362,11 @@ msgstr ""
msgid "including subgroups"
msgstr "包括子组"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20346,7 +20385,7 @@ msgstr "错误的元素"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20364,7 +20403,7 @@ msgstr "\"%1$s\"附近语法错误"
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20424,7 +20463,7 @@ msgstr "无效的主机群组名称"
msgid "invalid host name"
msgstr "无效的主机名称"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20446,6 +20485,16 @@ msgstr "无效的正则表达式"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20487,7 +20536,7 @@ msgstr "监控项模式"
msgid "key is empty"
msgstr "关键字为空"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20503,7 +20552,7 @@ msgctxt "week of month"
msgid "last"
msgstr "最新"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last() - 最后(最近)的 T 值"
@@ -20511,11 +20560,11 @@ msgstr "last() - 最后(最近)的 T 值"
msgid "left"
msgstr "左"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20523,23 +20572,23 @@ msgstr ""
msgid "list of characters"
msgstr "字符列表"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20547,7 +20596,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "底层发现规则"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20579,11 +20628,11 @@ msgstr "宏是空的"
msgid "macro(s)"
msgstr "宏(s)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20619,7 +20668,7 @@ msgstr "最大"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max() - 周期 T 内的最大值"
@@ -20633,7 +20682,7 @@ msgstr "达到最大依赖项数"
msgid "maximum number of dependency levels reached"
msgstr "达到最大数量的依赖关系"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20650,7 +20699,7 @@ msgstr ""
msgid "min"
msgstr "最小"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "min() - 周期 T 内的最小值"
@@ -20665,15 +20714,15 @@ msgstr "最小长度为 %1$s 个字符"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20755,7 +20804,7 @@ msgstr "名字"
msgid "new"
msgstr "新"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "新"
@@ -20789,7 +20838,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20810,7 +20859,7 @@ msgstr "非在"
msgid "not selected"
msgstr "非所选的"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now() - UNIX 时间"
@@ -20897,15 +20946,15 @@ msgstr ""
msgid "pattern"
msgstr "模式"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "percentile() - 周期 T 内的百分位数 P"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -20913,15 +20962,15 @@ msgstr ""
msgid "problem pattern"
msgstr "问题模式"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -20970,11 +21019,11 @@ msgstr ""
msgid "regular expression"
msgstr "正则表达式"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -20998,15 +21047,15 @@ msgstr ""
msgid "right"
msgstr "正确"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21097,23 +21146,23 @@ msgstr "展示图标映射"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
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:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21121,11 +21170,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21133,11 +21182,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "sum() - 周期 T 内的值之和"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21165,7 +21214,7 @@ msgstr "提供的凭据不是唯一的"
msgid "tag"
msgstr "标记"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21199,7 +21248,7 @@ msgstr ""
#: 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:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21246,31 +21295,35 @@ msgstr ""
msgid "time shift"
msgstr "时间偏移"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time() - 当前时间"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft() - 基于周期 T 内达到阈值的时间估计"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21296,11 +21349,11 @@ msgstr "触发器原型无法移动到另外一个模板或者主机"
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "触发器原型以及关联项无法移动到另外一个模板或者主机"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21357,7 +21410,7 @@ 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:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21400,7 +21453,7 @@ msgstr "\"%1$s\" 值异常"
msgid "unknown"
msgstr "未知的"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21597,11 +21650,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""