diff options
Diffstat (limited to 'frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po')
| -rw-r--r-- | frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po | 2337 |
1 files changed, 1165 insertions, 1172 deletions
diff --git a/frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po b/frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po index df3b0e64408..235268af8a5 100644 --- a/frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po +++ b/frontends/php/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: 2019-01-13 23:40+0200\n" +"POT-Creation-Date: 2019-02-03 01:45+0200\n" "PO-Revision-Date: 2017-10-11 11:47+0300\n" "Last-Translator: 岂几 <tom3000@126.com>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -26,12 +26,12 @@ msgstr "" #: include/classes/import/validators/C32XmlValidator.php:1007 #: include/classes/import/validators/C34XmlValidator.php:1111 #: include/classes/import/validators/C40XmlValidator.php:1290 -#: include/classes/import/validators/C42XmlValidator.php:1298 +#: include/classes/import/validators/C42XmlValidator.php:1326 #, c-format msgid "\"%1$s\" is expected" msgstr "\"%1$s\" 预计" -#: include/classes/api/services/CItemGeneral.php:1324 +#: include/classes/api/services/CItemGeneral.php:1414 #, c-format msgid "\"%1$s\" value must be less than or equal to \"%2$s\" value" msgstr "" @@ -51,6 +51,13 @@ msgstr "\"%s\" 必须在 1970.01.01 和 2038.01.18之间。" msgid "\"host:key\" pair is expected" msgstr "“主机：key值” 关键的预计" +#: include/forms.inc.php:1475 +#: include/views/configuration.host.discovery.edit.php:714 +#: include/views/js/configuration.host.discovery.edit.js.php:52 +#: include/views/js/item.preprocessing.js.php:162 +msgid "$.path.to.node" +msgstr "" + #: include/classes/api/services/CDRule.php:520 #, c-format msgid "%1$d characters exceeds maximum length of %2$d characters" @@ -86,7 +93,7 @@ msgid "%1$s Item" msgid_plural "%1$s Items" msgstr[0] "%1$s 监控项" -#: include/classes/api/services/CItemGeneral.php:2227 +#: include/classes/api/services/CItemGeneral.php:2190 #: include/classes/import/readers/CXmlImportReader.php:46 #, c-format msgid "%1$s [Line: %2$s | Column: %3$s]" @@ -289,11 +296,11 @@ msgstr "" msgid "ADD OVERRIDE" msgstr "" -#: include/views/configuration.host.discovery.edit.php:439 -#: include/views/configuration.item.edit.php:565 -#: include/views/configuration.item.edit.php:572 -#: include/views/configuration.item.massupdate.php:248 -#: include/views/configuration.item.prototype.edit.php:518 +#: include/views/configuration.host.discovery.edit.php:427 +#: include/views/configuration.item.edit.php:551 +#: include/views/configuration.item.edit.php:558 +#: include/views/configuration.item.massupdate.php:239 +#: include/views/configuration.item.prototype.edit.php:504 #: include/views/configuration.item.prototype.massupdate.php:235 #: include/views/js/configuration.discovery.edit.js.php:113 msgid "AES" @@ -363,6 +370,7 @@ msgstr "" #: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:80 #: include/actions.inc.php:1910 include/actions.inc.php:1994 #: include/audit.inc.php:29 include/classes/screens/CScreenActions.php:127 +#: include/forms.inc.php:1402 #: include/views/administration.auditacts.list.php:57 #: include/views/administration.auditlogs.list.php:42 #: include/views/administration.auditlogs.list.php:74 @@ -390,19 +398,15 @@ msgstr "" #: include/views/configuration.correlation.edit.php:48 #: include/views/configuration.correlation.edit.php:218 #: include/views/configuration.graph.edit.php:346 -#: include/views/configuration.host.discovery.edit.php:518 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/views/configuration.host.discovery.edit.php:506 +#: include/views/configuration.host.discovery.edit.php:605 #: include/views/configuration.host.edit.php:546 #: include/views/configuration.host.prototype.edit.php:255 #: include/views/configuration.httpconf.edit.php:202 -#: include/views/configuration.item.edit.php:700 -#: include/views/configuration.item.edit.php:941 -#: include/views/configuration.item.massupdate.php:344 -#: include/views/configuration.item.massupdate.php:458 -#: include/views/configuration.item.prototype.edit.php:629 -#: include/views/configuration.item.prototype.edit.php:774 -#: include/views/configuration.item.prototype.massupdate.php:321 -#: include/views/configuration.item.prototype.massupdate.php:436 +#: include/views/configuration.item.edit.php:687 +#: include/views/configuration.item.massupdate.php:340 +#: include/views/configuration.item.prototype.edit.php:616 +#: include/views/configuration.item.prototype.massupdate.php:336 #: include/views/configuration.maintenance.edit.php:77 #: include/views/configuration.services.edit.php:117 #: include/views/configuration.services.edit.php:170 @@ -535,7 +539,7 @@ msgstr "启用直到" #: app/views/popup.httpstep.php:161 app/views/popup.media.php:48 #: app/views/popup.media.php:112 app/views/popup.triggerwizard.php:169 #: app/views/popup.triggerwizard.php:195 -#: include/classes/widgets/CWidgetHelper.php:420 +#: include/classes/widgets/CWidgetHelper.php:420 include/forms.inc.php:1615 #: include/views/administration.auditlogs.list.php:46 #: include/views/administration.general.iconmap.edit.php:101 #: include/views/administration.general.iconmap.edit.php:142 @@ -570,11 +574,12 @@ msgstr "启用直到" #: include/views/configuration.discovery.edit.php:118 #: include/views/configuration.graph.edit.php:390 #: include/views/configuration.graph.edit.php:473 -#: include/views/configuration.host.discovery.edit.php:114 -#: include/views/configuration.host.discovery.edit.php:209 -#: include/views/configuration.host.discovery.edit.php:554 -#: include/views/configuration.host.discovery.edit.php:674 -#: include/views/configuration.host.discovery.edit.php:713 +#: include/views/configuration.host.discovery.edit.php:113 +#: include/views/configuration.host.discovery.edit.php:205 +#: include/views/configuration.host.discovery.edit.php:542 +#: include/views/configuration.host.discovery.edit.php:662 +#: include/views/configuration.host.discovery.edit.php:727 +#: include/views/configuration.host.discovery.edit.php:775 #: include/views/configuration.host.edit.php:116 #: include/views/configuration.host.edit.php:132 #: include/views/configuration.host.edit.php:148 @@ -588,25 +593,21 @@ msgstr "启用直到" #: include/views/configuration.httpconf.edit.php:128 #: include/views/configuration.httpconf.edit.php:268 #: include/views/configuration.httpconf.edit.php:310 -#: include/views/configuration.item.edit.php:146 -#: include/views/configuration.item.edit.php:241 -#: include/views/configuration.item.edit.php:749 -#: include/views/configuration.item.edit.php:1148 -#: include/views/configuration.item.edit.php:1195 -#: include/views/configuration.item.massupdate.php:158 -#: include/views/configuration.item.massupdate.php:430 -#: include/views/configuration.item.massupdate.php:496 -#: include/views/configuration.item.massupdate.php:610 -#: include/views/configuration.item.prototype.edit.php:134 -#: include/views/configuration.item.prototype.edit.php:229 -#: include/views/configuration.item.prototype.edit.php:665 -#: include/views/configuration.item.prototype.edit.php:981 -#: include/views/configuration.item.prototype.edit.php:1014 +#: include/views/configuration.item.edit.php:148 +#: include/views/configuration.item.edit.php:240 +#: include/views/configuration.item.edit.php:736 +#: include/views/configuration.item.edit.php:957 +#: include/views/configuration.item.massupdate.php:156 +#: include/views/configuration.item.massupdate.php:378 +#: include/views/configuration.item.massupdate.php:492 +#: include/views/configuration.item.prototype.edit.php:133 +#: include/views/configuration.item.prototype.edit.php:225 +#: include/views/configuration.item.prototype.edit.php:652 +#: include/views/configuration.item.prototype.edit.php:779 #: include/views/configuration.item.prototype.massupdate.php:152 -#: include/views/configuration.item.prototype.massupdate.php:407 -#: include/views/configuration.item.prototype.massupdate.php:474 -#: include/views/configuration.item.prototype.massupdate.php:566 -#: include/views/configuration.item.prototype.massupdate.php:641 +#: include/views/configuration.item.prototype.massupdate.php:374 +#: include/views/configuration.item.prototype.massupdate.php:466 +#: include/views/configuration.item.prototype.massupdate.php:541 #: include/views/configuration.maintenance.edit.php:137 #: include/views/configuration.maintenance.edit.php:224 #: include/views/configuration.maintenance.edit.php:295 @@ -888,11 +889,11 @@ msgstr "所有模板" msgid "Allow manual close" msgstr "允许手动关闭" -#: include/views/configuration.host.discovery.edit.php:576 -#: include/views/configuration.item.edit.php:852 -#: include/views/configuration.item.massupdate.php:575 -#: include/views/configuration.item.prototype.edit.php:721 -#: include/views/configuration.item.prototype.massupdate.php:556 +#: include/views/configuration.host.discovery.edit.php:565 +#: include/views/configuration.item.edit.php:837 +#: include/views/configuration.item.massupdate.php:457 +#: include/views/configuration.item.prototype.edit.php:710 +#: include/views/configuration.item.prototype.massupdate.php:456 msgid "Allowed hosts" msgstr "允许的主机" @@ -904,7 +905,7 @@ msgstr "另外，您也可以手动安装:" #: include/views/configuration.action.edit.php:112 #: include/views/configuration.action.edit.php:1150 #: include/views/configuration.correlation.edit.php:94 -#: include/views/configuration.host.discovery.edit.php:598 +#: include/views/configuration.host.discovery.edit.php:586 #: include/views/configuration.trigger.prototype.edit.php:130 #: include/views/configuration.trigger.prototype.edit.php:322 #: include/views/configuration.triggers.edit.php:151 @@ -918,7 +919,7 @@ msgstr "和（同时满足）" #: include/views/configuration.action.edit.php:111 #: include/views/configuration.action.edit.php:1149 #: include/views/configuration.correlation.edit.php:93 -#: include/views/configuration.host.discovery.edit.php:597 +#: include/views/configuration.host.discovery.edit.php:585 #: include/views/configuration.maintenance.edit.php:170 #: include/views/configuration.triggers.list.php:73 msgid "And/Or" @@ -979,8 +980,8 @@ msgid "Application error." msgstr "应用集 错误." #: app/controllers/CControllerPopupGeneric.php:136 -#: include/views/configuration.item.prototype.edit.php:751 -#: include/views/configuration.item.prototype.massupdate.php:637 +#: include/views/configuration.item.prototype.edit.php:741 +#: include/views/configuration.item.prototype.massupdate.php:537 msgid "Application prototypes" msgstr "应用集原型" @@ -1007,12 +1008,12 @@ msgstr "应用程序ID \"%1$s\" 不存在。" #: include/views/configuration.host.edit.php:304 #: include/views/configuration.host.list.php:129 #: include/views/configuration.host.list.php:320 -#: include/views/configuration.item.edit.php:887 +#: include/views/configuration.item.edit.php:872 #: include/views/configuration.item.list.php:70 -#: include/views/configuration.item.massupdate.php:636 -#: include/views/configuration.item.prototype.edit.php:736 +#: include/views/configuration.item.massupdate.php:518 +#: include/views/configuration.item.prototype.edit.php:726 #: include/views/configuration.item.prototype.list.php:58 -#: include/views/configuration.item.prototype.massupdate.php:562 +#: include/views/configuration.item.prototype.massupdate.php:462 #: include/views/configuration.template.edit.php:130 #: include/views/configuration.template.list.php:86 #: include/views/configuration.template.list.php:184 @@ -1045,7 +1046,7 @@ msgstr "接近中" msgid "Apr" msgstr "四月" -#: include/forms.inc.php:1980 include/func.inc.php:119 +#: include/forms.inc.php:2228 include/func.inc.php:119 #: include/func.inc.php:256 jsLoader.php:136 msgid "April" msgstr "四月" @@ -1070,16 +1071,16 @@ msgstr "区域大小" msgid "Area type" msgstr "区域类型" -#: include/items.inc.php:1742 +#: include/items.inc.php:1736 msgid "Arithmetic" msgstr "算法" -#: include/views/configuration.item.edit.php:822 -#: include/views/configuration.item.edit.php:828 -#: include/views/configuration.item.massupdate.php:551 -#: include/views/configuration.item.prototype.edit.php:701 -#: include/views/configuration.item.prototype.edit.php:707 -#: include/views/configuration.item.prototype.massupdate.php:532 +#: include/views/configuration.item.edit.php:807 +#: include/views/configuration.item.edit.php:813 +#: include/views/configuration.item.massupdate.php:434 +#: include/views/configuration.item.prototype.edit.php:688 +#: include/views/configuration.item.prototype.edit.php:694 +#: include/views/configuration.item.prototype.massupdate.php:432 msgid "As is" msgstr "不变" @@ -1113,7 +1114,7 @@ msgstr "在 %1$s:%2$s 的 %3$s %4$s 的每个 %5$s" msgid "At %1$s:%2$s on day %3$s of every %4$s" msgstr "在 %1$s:%2$s 的天 %3$s 的每个 %4$s" -#: include/forms.inc.php:2098 +#: include/forms.inc.php:2346 msgid "At (hour:minute)" msgstr "于(时:分)" @@ -1196,13 +1197,13 @@ msgstr "审计日志" msgid "Aug" msgstr "八月" -#: include/forms.inc.php:1967 include/func.inc.php:123 +#: include/forms.inc.php:2215 include/func.inc.php:123 #: include/func.inc.php:260 jsLoader.php:140 msgid "August" msgstr "八月" -#: app/views/administration.authentication.edit.php:127 -#: app/views/administration.authentication.edit.php:135 +#: app/views/administration.authentication.edit.php:137 +#: app/views/administration.authentication.edit.php:145 #: app/views/administration.mediatype.edit.php:89 include/menu.inc.php:265 #: include/views/configuration.httpconf.edit.php:283 #: include/views/configuration.httpconf.list.php:92 @@ -1222,37 +1223,37 @@ msgstr "" #: include/views/configuration.action.edit.php:948 #: include/views/configuration.action.edit.php:1735 #: include/views/configuration.action.edit.php:2193 -#: include/views/configuration.host.discovery.edit.php:464 -#: include/views/configuration.item.edit.php:611 -#: include/views/configuration.item.massupdate.php:296 -#: include/views/configuration.item.prototype.edit.php:543 +#: include/views/configuration.host.discovery.edit.php:447 +#: include/views/configuration.item.edit.php:598 +#: include/views/configuration.item.massupdate.php:282 +#: include/views/configuration.item.prototype.edit.php:524 #: include/views/configuration.item.prototype.massupdate.php:277 msgid "Authentication method" msgstr "认证方法" -#: app/controllers/CControllerAuthenticationUpdate.php:232 +#: app/controllers/CControllerAuthenticationUpdate.php:238 msgid "Authentication method changed" msgstr "" -#: include/views/configuration.host.discovery.edit.php:431 -#: include/views/configuration.item.edit.php:554 -#: include/views/configuration.item.massupdate.php:234 -#: include/views/configuration.item.prototype.edit.php:510 +#: include/views/configuration.host.discovery.edit.php:419 +#: include/views/configuration.item.edit.php:540 +#: include/views/configuration.item.massupdate.php:226 +#: include/views/configuration.item.prototype.edit.php:496 #: include/views/configuration.item.prototype.massupdate.php:222 #: include/views/js/configuration.discovery.edit.js.php:103 msgid "Authentication passphrase" msgstr "验证口令" -#: include/views/configuration.host.discovery.edit.php:424 -#: include/views/configuration.item.edit.php:548 -#: include/views/configuration.item.massupdate.php:221 -#: include/views/configuration.item.prototype.edit.php:503 +#: include/views/configuration.host.discovery.edit.php:412 +#: include/views/configuration.item.edit.php:535 +#: include/views/configuration.item.massupdate.php:214 +#: include/views/configuration.item.prototype.edit.php:489 #: include/views/configuration.item.prototype.massupdate.php:210 #: include/views/js/configuration.discovery.edit.js.php:95 msgid "Authentication protocol" msgstr "验证协议" -#: app/controllers/CControllerAuthenticationUpdate.php:231 +#: app/controllers/CControllerAuthenticationUpdate.php:237 msgid "Authentication settings updated" msgstr "" @@ -1350,7 +1351,7 @@ msgstr "背景色" msgid "Background image" msgstr "背景图片" -#: app/views/administration.authentication.edit.php:93 +#: app/views/administration.authentication.edit.php:98 msgid "Base DN" msgstr "基于 DN" @@ -1360,17 +1361,17 @@ msgid "Base colour" msgstr "" #: include/httptest.inc.php:28 -#: include/views/configuration.host.discovery.edit.php:285 -#: include/views/configuration.item.edit.php:326 -#: include/views/configuration.item.prototype.edit.php:314 +#: include/views/configuration.host.discovery.edit.php:276 +#: include/views/configuration.item.edit.php:319 +#: include/views/configuration.item.prototype.edit.php:304 msgid "Basic" msgstr "基础的" -#: app/views/administration.authentication.edit.php:103 +#: app/views/administration.authentication.edit.php:110 msgid "Bind DN" msgstr "绑定 DN" -#: app/views/administration.authentication.edit.php:113 +#: app/views/administration.authentication.edit.php:121 msgid "Bind password" msgstr "绑定密码" @@ -1388,16 +1389,16 @@ msgid "Blue" msgstr "蓝" #: app/views/popup.httpstep.php:142 -#: include/views/configuration.host.discovery.edit.php:261 -#: include/views/configuration.item.edit.php:293 -#: include/views/configuration.item.prototype.edit.php:281 +#: include/views/configuration.host.discovery.edit.php:254 +#: include/views/configuration.item.edit.php:289 +#: include/views/configuration.item.prototype.edit.php:274 msgid "Body" msgstr "" #: app/views/popup.httpstep.php:144 -#: include/views/configuration.host.discovery.edit.php:263 -#: include/views/configuration.item.edit.php:295 -#: include/views/configuration.item.prototype.edit.php:283 +#: include/views/configuration.host.discovery.edit.php:256 +#: include/views/configuration.item.edit.php:291 +#: include/views/configuration.item.prototype.edit.php:276 msgid "Body and headers" msgstr "" @@ -1406,7 +1407,7 @@ msgstr "" msgid "Bold line" msgstr "粗线" -#: include/items.inc.php:1757 +#: include/items.inc.php:1749 msgid "Boolean to decimal" msgstr "布尔值到十进制" @@ -1584,13 +1585,13 @@ msgstr "无法添加关联条件" msgid "Cannot add dependency from a host to a template." msgstr "无法添加自主机到模板的依赖" -#: include/classes/api/services/CDiscoveryRule.php:847 +#: include/classes/api/services/CDiscoveryRule.php:864 #: include/triggers.inc.php:527 #, c-format msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"." msgstr "无法自触发器\"%1$s:%2$s\" 添加依赖到不存在的触发器\"%3$s:%4$s\"." -#: host_discovery.php:474 +#: host_discovery.php:553 msgid "Cannot add discovery rule" msgstr "无法添加自动自动发现的规则" @@ -1747,25 +1748,25 @@ msgstr "" msgid "Cannot call method \"%1$s.%2$s\" without parameters." msgstr "不能调用方法 \"%1$s.%2$s\" 未带参数。" -#: httpconf.php:198 httpconf.php:504 items.php:999 items.php:1394 +#: httpconf.php:198 httpconf.php:504 items.php:999 items.php:1395 msgid "Cannot clear history" msgstr "无法清除历史" -#: include/classes/api/services/CDiscoveryRule.php:1588 +#: include/classes/api/services/CDiscoveryRule.php:1894 msgid "Cannot clone graph prototypes." msgstr "无法克隆图形原型" -#: include/classes/api/services/CDiscoveryRule.php:1636 +#: include/classes/api/services/CDiscoveryRule.php:1942 msgid "Cannot clone host prototypes." msgstr "无法克隆主机原型。" -#: include/classes/api/services/CDiscoveryRule.php:1393 -#: include/classes/api/services/CDiscoveryRule.php:1449 -#: include/classes/api/services/CDiscoveryRule.php:1467 +#: include/classes/api/services/CDiscoveryRule.php:1699 +#: include/classes/api/services/CDiscoveryRule.php:1755 +#: include/classes/api/services/CDiscoveryRule.php:1773 msgid "Cannot clone item prototypes." msgstr "无法克隆监控项原型" -#: include/classes/api/services/CDiscoveryRule.php:760 +#: include/classes/api/services/CDiscoveryRule.php:777 msgid "Cannot clone trigger prototypes." msgstr "无法克隆触发器原型" @@ -1791,7 +1792,7 @@ msgid "Cannot copy graph" msgid_plural "Cannot copy graphs" msgstr[0] "无法复制图表" -#: items.php:1350 +#: items.php:1351 msgid "Cannot copy item" msgid_plural "Cannot copy items" msgstr[0] "无法复制监控项" @@ -1890,11 +1891,11 @@ msgstr "无法删除依赖关系" msgid "Cannot delete discovered application \"%1$s\"." msgstr "不能删除已发现的应用集 \"%1$s\"." -#: discoveryconf.php:186 host_discovery.php:274 +#: discoveryconf.php:186 host_discovery.php:278 msgid "Cannot delete discovery rule" msgstr "无法删除自动发现规则" -#: discoveryconf.php:228 host_discovery.php:517 +#: discoveryconf.php:228 host_discovery.php:596 msgid "Cannot delete discovery rules" msgstr "无法删除自动发现规则" @@ -1923,7 +1924,19 @@ msgstr[0] "无法删除组" msgid "Cannot delete host" msgstr "无法删除主机" -#: include/classes/api/services/CDiscoveryRule.php:533 +#: include/classes/api/services/CHost.php:1189 +#, c-format +msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one host or host group." +msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group." +msgstr[0] "" + +#: include/classes/api/services/CHostGroup.php:1503 +#, c-format +msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." +msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." +msgstr[0] "" + +#: include/classes/api/services/CDiscoveryRule.php:548 msgid "Cannot delete host prototype." msgstr "无法删除主机原型。" @@ -1955,7 +1968,7 @@ msgstr "无法删除监控项目模板" msgid "Cannot delete item prototypes" msgstr "无法删除监控项目模板" -#: items.php:1404 +#: items.php:1405 msgid "Cannot delete items" msgstr "无法删除监控项" @@ -2032,15 +2045,15 @@ msgstr "" msgid "Cannot delete templated host prototype." msgstr "无法删除模板的主机原型。" -#: include/classes/api/services/CItemPrototype.php:876 +#: include/classes/api/services/CItemPrototype.php:890 msgid "Cannot delete templated item prototype." msgstr "" -#: include/classes/api/services/CItem.php:706 +#: include/classes/api/services/CItem.php:719 msgid "Cannot delete templated item." msgstr "无法删除模板的监控项." -#: include/classes/api/services/CDiscoveryRule.php:484 +#: include/classes/api/services/CDiscoveryRule.php:499 msgid "Cannot delete templated items." msgstr "无法删除模板监控项." @@ -2098,7 +2111,7 @@ msgid "Cannot disable correlation" msgid_plural "Cannot disable correlations" msgstr[0] "无法停用关联项" -#: discoveryconf.php:213 host_discovery.php:507 +#: discoveryconf.php:213 host_discovery.php:586 msgid "Cannot disable discovery rule" msgid_plural "Cannot disable discovery rules" msgstr[0] "无法禁用自动发现规则" @@ -2109,7 +2122,7 @@ msgid "Cannot disable host" msgid_plural "Cannot disable hosts" msgstr[0] "无法禁用主机" -#: applications.php:175 items.php:1310 +#: applications.php:175 items.php:1311 msgid "Cannot disable item" msgid_plural "Cannot disable items" msgstr[0] "无法禁监控项目" @@ -2152,7 +2165,7 @@ msgid "Cannot enable correlation" msgid_plural "Cannot enable correlations" msgstr[0] "无法启用关联项" -#: discoveryconf.php:212 host_discovery.php:506 +#: discoveryconf.php:212 host_discovery.php:585 msgid "Cannot enable discovery rule" msgid_plural "Cannot enable discovery rules" msgstr[0] "无法启用自动发现规则" @@ -2163,7 +2176,7 @@ msgid "Cannot enable host" msgid_plural "Cannot enable hosts" msgstr[0] "无法启用主机" -#: applications.php:174 items.php:1309 +#: applications.php:174 items.php:1310 msgid "Cannot enable item" msgid_plural "Cannot enable items" msgstr[0] "无法启用监控项目" @@ -2226,13 +2239,13 @@ msgstr "无法找到主机 \"%1$s\" 用于地图 \"%2$s\"." msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"." msgstr "无法找到主机 \"%1$s\" 用于聚合图形 \"%2$s\"." -#: include/classes/import/CConfigurationImport.php:1086 +#: include/classes/import/CConfigurationImport.php:1094 #, c-format msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "在 \"%4$s\"上无法针对自动发现规则 \"%3$s\"上的\"%2$s\"主机模板找到主机组 \"%1$s\"" -#: include/classes/api/services/CDiscoveryRule.php:1256 -#: include/classes/api/services/CDiscoveryRule.php:1420 +#: include/classes/api/services/CDiscoveryRule.php:1562 +#: include/classes/api/services/CDiscoveryRule.php:1726 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:506 #: include/items.inc.php:653 #, c-format @@ -2249,32 +2262,32 @@ msgstr "无法找到图标 \"%1$s\" 用于地图 \"%2$s\"." msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"." msgstr "无法找到地图图标 \"%1$s\" 用于地图 \"%2$s\"." -#: include/classes/import/CConfigurationImport.php:1470 +#: include/classes/import/CConfigurationImport.php:1478 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MAX value for graph \"%3$s\"." msgstr "无法为数据图\"%3$s\"在\"%2$s\"上找到可以作为最大Y值的监控项目 \"%1$s\"." -#: include/classes/import/CConfigurationImport.php:1239 +#: include/classes/import/CConfigurationImport.php:1247 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MAX value for graph prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"." msgstr "无法在\"%2$s\"上为\"%5$s\"上的自动发现规则\"%4$s\"上的数据图模板\"%3$s\"找到可以作为最大Y值的监控项目\"%1$s\"." -#: include/classes/import/CConfigurationImport.php:1454 +#: include/classes/import/CConfigurationImport.php:1462 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MIN value for graph \"%3$s\"." msgstr "无法为数据图 \"%3$s\"在\"%2$s\"上可以作为最小值的监控项目\"%1$s\"" -#: include/classes/import/CConfigurationImport.php:1219 +#: include/classes/import/CConfigurationImport.php:1227 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MIN value for graph prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"." msgstr "无法在\"%2$s\"上为\"%5$s\"上的自动发现规则\"%4$s\"上的数据图模板\"%3$s\"找到可以作为最小Y值的监控项目\"%1$s\"" -#: include/classes/import/CConfigurationImport.php:1489 +#: include/classes/import/CConfigurationImport.php:1497 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"." msgstr "无法在\"%2$s\"上找到被数据图\"%3$s\"引用的监控项目\"%1$s\"." -#: include/classes/import/CConfigurationImport.php:1259 +#: include/classes/import/CConfigurationImport.php:1267 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"." msgstr "在 \"%5$s\"中无法找到被自动发现规则\"%4$s\"上的数据图模板 \"%3$s\"在\"%2$s\"上所引用的监控项目\"%1$s\"." @@ -2303,7 +2316,7 @@ msgstr "无法找到有名称的物件" msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"." msgstr "无法找到屏幕 \"%1$s\" 用于聚合图形 \"%2$s\"." -#: include/classes/import/CConfigurationImport.php:1109 +#: include/classes/import/CConfigurationImport.php:1117 #, c-format msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "无法在\"%4$s\"上为自动发现规则 \"%3$s\"上的主机模板\"%2$s\"找模板\"%1$s\"" @@ -2319,7 +2332,7 @@ msgstr "无法找到触发器 \"%1$s\" 用于地图 \"%2$s\"." msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"." msgstr "无法在 \"%3$s\"上找到由监控项目\"%2$s\" 所引用的数据映射\"%1$s\"." -#: include/classes/import/CConfigurationImport.php:1014 +#: include/classes/import/CConfigurationImport.php:1022 #, c-format msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "无法在\"%4$s\"上找到由自动发现规则 \"%3$s\"上的 \"%2$s\"监控项目模板所引用的数据映射 \"%1$s\"." @@ -2332,7 +2345,7 @@ msgstr "无法形成树状格式. 检查服务链接的逻辑结构." msgid "Cannot format tree." msgstr "无法形成树状格式" -#: include/classes/api/services/CTemplate.php:805 +#: include/classes/api/services/CTemplate.php:803 msgid "Cannot have empty visible template name." msgstr "模板的显示名称不得为空." @@ -2366,8 +2379,8 @@ msgstr "不能插入触发器表达式" msgid "Cannot link template" msgstr "无法链接模板" -#: include/classes/api/services/CTemplate.php:892 -#: include/classes/api/services/CTemplate.php:906 +#: include/classes/api/services/CTemplate.php:890 +#: include/classes/api/services/CTemplate.php:904 msgid "Cannot link template." msgstr "无法链接到模板。" @@ -2379,7 +2392,7 @@ msgstr "不能登出" msgid "Cannot mass update host name." msgstr "不能大量更新主机名称." -#: include/classes/api/services/CTemplate.php:1030 +#: include/classes/api/services/CTemplate.php:1028 msgid "Cannot mass update template name." msgstr "无法批量更新模板名称." @@ -2387,7 +2400,7 @@ msgstr "无法批量更新模板名称." msgid "Cannot mass update visible host name." msgstr "不能大量更新可见主机名称" -#: include/classes/api/services/CTemplate.php:995 +#: include/classes/api/services/CTemplate.php:993 msgid "Cannot mass update visible template name." msgstr "无法批量更新模板的显示名称" @@ -2415,8 +2428,8 @@ msgstr "不能完成没有条件的更新描述式在表 \"%1$s\" 上." msgid "Cannot process applications from different hosts or templates." msgstr "无法在不同的主机或模板上执行分类" -#: include/classes/api/services/CItemGeneral.php:2235 -#: include/classes/api/services/CItemGeneral.php:2262 +#: include/classes/api/services/CItemGeneral.php:2198 +#: include/classes/api/services/CItemGeneral.php:2225 msgid "Cannot read JSON." msgstr "" @@ -2425,8 +2438,8 @@ msgstr "" msgid "Cannot read JSON: %1$s." msgstr "无法读取JSON：%1$s 。" -#: include/classes/api/services/CItemGeneral.php:2222 -#: include/classes/api/services/CItemGeneral.php:2226 +#: include/classes/api/services/CItemGeneral.php:2185 +#: include/classes/api/services/CItemGeneral.php:2189 #: include/classes/import/readers/CXmlImportReader.php:35 #: include/classes/import/readers/CXmlImportReader.php:46 #, c-format @@ -2457,7 +2470,7 @@ msgstr "无法保存小构件 \"%1$s\" 。" msgid "Cannot send command, check connection with Zabbix server \"%1$s\"." msgstr "无法发送命令, 检查于Zabbix 服务器 \"%1$s\" 的连接." -#: host_discovery.php:284 host_discovery.php:529 items.php:967 items.php:1416 +#: host_discovery.php:288 host_discovery.php:608 items.php:967 items.php:1417 msgid "Cannot send request" msgstr "" @@ -2506,7 +2519,7 @@ msgstr "无法设置 \"%1$s\" 为触发器 \"%2$s\"." msgid "Cannot set \"%1$s\" for trigger prototype \"%2$s\"." msgstr "在触发器模板 \"%2$s\" 中 无法设置 \"%1$s\" " -#: include/classes/api/services/CItemPrototype.php:324 +#: include/classes/api/services/CItemPrototype.php:339 #, c-format msgid "Cannot set \"templateid\" field for application prototype in item prototype \"%1$s\"." msgstr "不能设置 \"templateid\" 设置到项目原形 \"%1$s\" 。" @@ -2517,8 +2530,8 @@ msgid "Cannot set \"templateid\" for screen \"%1$s\"." msgstr "无法设置 \"模板序列号\" 为聚合图形 \"%1$s\"." #: include/classes/api/services/CHost.php:881 -#: include/classes/api/services/CHost.php:1705 -#: include/classes/api/services/CHost.php:1849 +#: include/classes/api/services/CHost.php:1741 +#: include/classes/api/services/CHost.php:1885 msgid "Cannot set inventory fields for disabled inventory." msgstr "无法设置审计字段为已经禁止的审计." @@ -2535,15 +2548,15 @@ msgstr "无法切换接口主机." msgid "Cannot unblock users" msgstr "无法解锁用户" -#: include/classes/api/services/CHostGeneral.php:563 +#: include/classes/api/services/CHostGeneral.php:559 msgid "Cannot unlink and clear Web scenarios." msgstr "无法断开和清除 Web 场景." -#: include/classes/api/services/CHostGeneral.php:624 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear applications." msgstr "无法断开和清除应用程序." -#: include/classes/api/services/CHostGeneral.php:367 +#: include/classes/api/services/CHostGeneral.php:363 msgid "Cannot unlink and clear discovery rules" msgstr "无法断开和清除探索规则" @@ -2551,12 +2564,12 @@ msgstr "无法断开和清除探索规则" msgid "Cannot unlink template" msgstr "无法断开与模板的连接" -#: include/classes/api/services/CTemplate.php:857 -#: include/classes/api/services/CTemplate.php:880 +#: include/classes/api/services/CTemplate.php:855 +#: include/classes/api/services/CTemplate.php:878 msgid "Cannot unlink template." msgstr "无法断开与模板的连接。" -#: include/classes/api/services/CHostGeneral.php:273 +#: include/classes/api/services/CHostGeneral.php:269 #, c-format msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host." msgstr "不能断开与触发器\"%s\" 的连接, 它仍含有链接到主机的模板的监控项." @@ -2602,7 +2615,7 @@ msgstr "无法更新 \"%1$s\" 为触发器 \"%2$s\"." msgid "Cannot update \"%1$s\" for trigger prototype \"%2$s\"." msgstr "无法更新触发器模板\"%2$s\"的\"%1$s\"" -#: include/classes/api/services/CHost.php:1828 +#: include/classes/api/services/CHost.php:1864 #, c-format msgid "Cannot update \"%2$s\" for a discovered host \"%1$s\"." msgstr "无法更新 \"%2$s\"在发现的主机\"%1$s\"。" @@ -2638,7 +2651,7 @@ msgstr "无法对聚合图形模板\"%1$s\"更新\"模板ID\"。" msgid "Cannot update a discovered graph." msgstr "无法更新一个被自动发现的数据图" -#: include/classes/api/services/CHostGroup.php:780 +#: include/classes/api/services/CHostGroup.php:797 msgid "Cannot update a discovered host group." msgstr "无法更新一个被自动发现的主机组." @@ -2655,7 +2668,7 @@ msgstr "无法更新动作" msgid "Cannot update application" msgstr "无法更新应用集" -#: app/controllers/CControllerAuthenticationUpdate.php:236 +#: app/controllers/CControllerAuthenticationUpdate.php:242 msgid "Cannot update authentication" msgstr "" @@ -2682,7 +2695,7 @@ msgstr "无法更描述" msgid "Cannot update discovered application \"%1$s\"." msgstr "无法更新发现的应用\"%1$s\"。" -#: discoveryconf.php:155 host_discovery.php:477 +#: discoveryconf.php:155 host_discovery.php:556 msgid "Cannot update discovery rule" msgstr "无法更新自动发现规则" @@ -2708,9 +2721,9 @@ msgstr "无法更新数据图模板" msgid "Cannot update group" msgstr "无法更新群组" -#: include/classes/api/services/CHostGroup.php:986 -#: include/classes/api/services/CHostGroup.php:1090 -#: include/classes/api/services/CHostGroup.php:1226 +#: include/classes/api/services/CHostGroup.php:1003 +#: include/classes/api/services/CHostGroup.php:1107 +#: include/classes/api/services/CHostGroup.php:1243 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "对于被自动发现的主机\"%1$s\"无法更新其主机组" @@ -2754,11 +2767,11 @@ msgid "Cannot update item prototype" msgid_plural "Cannot update item prototypes" msgstr[0] "无法更新监控项目模板" -#: disc_prototypes.php:1103 +#: disc_prototypes.php:1116 msgid "Cannot update item prototypes" msgstr "" -#: items.php:1286 +#: items.php:1287 msgid "Cannot update items" msgstr "无法更新监控项" @@ -2826,7 +2839,7 @@ msgid "Cannot update templated applications." msgstr "无法更新被模板化的应用程序." #: include/classes/api/services/CTemplate.php:754 -#: include/classes/api/services/CTemplate.php:1090 +#: include/classes/api/services/CTemplate.php:1088 #, c-format msgid "Cannot update templates on discovered host \"%1$s\"." msgstr "对于被自动发现的主机 \"%1$s\"无法更新其模板" @@ -2879,8 +2892,8 @@ msgstr "不可用的发现检查：请求不合法或连接到Zabbix服务器失 msgid "Case sensitive" msgstr "区分大小写" -#: app/views/administration.authentication.edit.php:52 -#: app/views/administration.authentication.edit.php:108 +#: app/views/administration.authentication.edit.php:53 +#: app/views/administration.authentication.edit.php:115 msgid "Case sensitive login" msgstr "" @@ -2912,7 +2925,8 @@ msgstr "" msgid "Certificate" msgstr "证书" -#: include/items.inc.php:1748 latest.php:429 latest.php:442 +#: include/items.inc.php:1740 include/items.inc.php:1744 latest.php:429 +#: latest.php:442 msgctxt "noun" msgid "Change" msgstr "更改" @@ -2926,13 +2940,13 @@ msgctxt "verb" msgid "Change" msgstr "更改" -#: app/views/administration.authentication.edit.php:70 +#: app/views/administration.authentication.edit.php:72 #: app/views/administration.mediatype.edit.php:140 #: include/views/administration.users.edit.php:128 msgid "Change password" msgstr "修改密码" -#: include/items.inc.php:1751 +#: include/items.inc.php:1745 msgid "Change per second" msgstr "每秒更改" @@ -2941,9 +2955,9 @@ msgid "Change severity" msgstr "" #: include/forms.inc.php:353 include/items.inc.php:131 -#: include/views/configuration.item.edit.php:678 -#: include/views/configuration.item.massupdate.php:279 -#: include/views/configuration.item.prototype.edit.php:607 +#: include/views/configuration.item.edit.php:665 +#: include/views/configuration.item.massupdate.php:267 +#: include/views/configuration.item.prototype.edit.php:594 #: include/views/configuration.item.prototype.massupdate.php:262 msgid "Character" msgstr "字符" @@ -2974,21 +2988,21 @@ msgstr "检查已存在." msgid "Check expression part starting from \"%1$s\"." msgstr "检查开始于\"%1$s\"的表达式部份." -#: include/items.inc.php:1768 +#: include/items.inc.php:1773 msgid "Check for error in JSON" msgstr "" -#: include/items.inc.php:1769 +#: include/items.inc.php:1777 msgid "Check for error in XML" msgstr "" -#: include/items.inc.php:1770 +#: include/items.inc.php:1781 msgid "Check for error using regular expression" msgstr "" -#: include/views/configuration.host.discovery.edit.php:698 +#: include/views/configuration.host.discovery.edit.php:760 #: include/views/configuration.host.discovery.list.php:157 -#: include/views/configuration.item.edit.php:1172 +#: include/views/configuration.item.edit.php:934 #: include/views/configuration.item.list.php:286 msgid "Check now" msgstr "" @@ -3103,7 +3117,7 @@ msgid "Clear history" msgstr "清除历史" #: include/views/configuration.httpconf.edit.php:297 -#: include/views/configuration.item.edit.php:1182 +#: include/views/configuration.item.edit.php:944 msgid "Clear history and trends" msgstr "清除历史和趋势" @@ -3127,13 +3141,13 @@ msgstr "时钟" #: include/views/configuration.correlation.edit.php:277 #: include/views/configuration.discovery.edit.php:110 #: include/views/configuration.graph.edit.php:465 -#: include/views/configuration.host.discovery.edit.php:695 +#: include/views/configuration.host.discovery.edit.php:757 #: include/views/configuration.host.edit.php:812 #: include/views/configuration.hostgroups.edit.php:58 #: include/views/configuration.host.prototype.edit.php:436 #: include/views/configuration.httpconf.edit.php:290 -#: include/views/configuration.item.edit.php:1169 -#: include/views/configuration.item.prototype.edit.php:1004 +#: include/views/configuration.item.edit.php:931 +#: include/views/configuration.item.prototype.edit.php:769 #: include/views/configuration.maintenance.edit.php:287 #: include/views/configuration.template.edit.php:445 #: include/views/configuration.trigger.prototype.edit.php:636 @@ -3267,7 +3281,7 @@ msgstr "对于动作\"%1$s\"条件\"%2$s\"不可以应用于计算式\"%3$s\"中 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." msgstr "在关联\"%1$s\"中，条件\"%2$s\"无法使用公式 \"%3$s\" " -#: include/classes/api/services/CDiscoveryRule.php:1081 +#: include/classes/api/services/CDiscoveryRule.php:1245 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." msgstr "对于自动发现规则\"%1$s\"条件\"%2$s\"不可以应用于计算式\"%3$s\"中" @@ -3282,7 +3296,7 @@ msgstr "对于动作\"%1$s\"应用于计算式 \"%3$s\"中的\"%2$s\"条件未 msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." msgstr "在关联项 \"%1$s\" 中 条件 \"%2$s\" 在表达式 \"%3$s\"没有被使用" -#: include/classes/api/services/CDiscoveryRule.php:1080 +#: include/classes/api/services/CDiscoveryRule.php:1244 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." msgstr "对于自动发现规则\"%1$s\"应用于计算表达式 \"%3$s\"中的条件 \"%2$s\"未被定义" @@ -3334,7 +3348,7 @@ msgstr "动作的配置" msgid "Configuration of applications" msgstr "应用集的配置" -#: app/controllers/CControllerAuthenticationEdit.php:127 +#: app/controllers/CControllerAuthenticationEdit.php:120 msgid "Configuration of authentication" msgstr "" @@ -3653,10 +3667,10 @@ msgstr "" msgid "Content menu" msgstr "" -#: include/views/configuration.host.discovery.edit.php:400 -#: include/views/configuration.item.edit.php:495 -#: include/views/configuration.item.massupdate.php:193 -#: include/views/configuration.item.prototype.edit.php:479 +#: include/views/configuration.host.discovery.edit.php:385 +#: include/views/configuration.item.edit.php:481 +#: include/views/configuration.item.massupdate.php:189 +#: include/views/configuration.item.prototype.edit.php:464 #: include/views/configuration.item.prototype.massupdate.php:185 #: include/views/js/configuration.discovery.edit.js.php:72 msgid "Context name" @@ -3666,8 +3680,8 @@ msgstr "上下文名称" msgid "Contract number" msgstr "合同号码" -#: include/views/configuration.item.edit.php:303 -#: include/views/configuration.item.prototype.edit.php:291 +#: include/views/configuration.item.edit.php:298 +#: include/views/configuration.item.prototype.edit.php:283 msgid "Convert to JSON" msgstr "" @@ -3804,10 +3818,10 @@ msgstr "创建发现规则" #: include/views/configuration.host.prototype.edit.php:164 #: include/views/configuration.host.prototype.list.php:55 #: include/views/configuration.host.prototype.list.php:154 -#: include/views/configuration.item.prototype.edit.php:761 +#: include/views/configuration.item.prototype.edit.php:747 #: include/views/configuration.item.prototype.list.php:59 #: include/views/configuration.item.prototype.list.php:170 -#: include/views/configuration.item.prototype.massupdate.php:518 +#: include/views/configuration.item.prototype.massupdate.php:418 #: include/views/configuration.trigger.prototype.edit.php:539 #: include/views/configuration.trigger.prototype.list.php:53 #: include/views/configuration.trigger.prototype.list.php:158 @@ -3973,7 +3987,7 @@ msgstr "习惯" #: include/views/configuration.action.edit.php:114 #: include/views/configuration.correlation.edit.php:96 -#: include/views/configuration.host.discovery.edit.php:600 +#: include/views/configuration.host.discovery.edit.php:588 msgid "Custom expression" msgstr "自定义表达式" @@ -3981,11 +3995,11 @@ msgstr "自定义表达式" msgid "Custom graphs" msgstr "自定义图表" -#: include/views/configuration.host.discovery.edit.php:559 -#: include/views/configuration.item.edit.php:754 -#: include/views/configuration.item.massupdate.php:502 -#: include/views/configuration.item.prototype.edit.php:669 -#: include/views/configuration.item.prototype.massupdate.php:480 +#: include/views/configuration.host.discovery.edit.php:548 +#: include/views/configuration.item.edit.php:741 +#: include/views/configuration.item.massupdate.php:384 +#: include/views/configuration.item.prototype.edit.php:656 +#: include/views/configuration.item.prototype.massupdate.php:380 msgid "Custom intervals" msgstr "自定义时间间隔" @@ -3999,15 +4013,12 @@ msgstr "自定义标签" msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty." msgstr "自定义标签地图 \"%2$s\" 类型元素 \"%1$s\" 不能为空." -#: include/items.inc.php:1744 +#: include/items.inc.php:1737 msgid "Custom multiplier" msgstr "自定义倍数" -#: include/views/configuration.item.edit.php:938 -#: include/views/configuration.item.edit.php:1099 -#: include/views/configuration.item.prototype.edit.php:771 -#: include/views/configuration.item.prototype.edit.php:932 -#: include/views/js/common.item.edit.js.php:75 +#: include/forms.inc.php:1399 include/forms.inc.php:1563 +#: include/views/js/item.preprocessing.js.php:44 msgid "Custom on fail" msgstr "" @@ -4042,11 +4053,11 @@ msgctxt "XML date format" msgid "DD.MM.YY" msgstr "DD.MM.YY" -#: include/views/configuration.host.discovery.edit.php:438 -#: include/views/configuration.item.edit.php:564 -#: include/views/configuration.item.edit.php:571 -#: include/views/configuration.item.massupdate.php:247 -#: include/views/configuration.item.prototype.edit.php:517 +#: include/views/configuration.host.discovery.edit.php:426 +#: include/views/configuration.item.edit.php:550 +#: include/views/configuration.item.edit.php:557 +#: include/views/configuration.item.massupdate.php:238 +#: include/views/configuration.item.prototype.edit.php:503 #: include/views/configuration.item.prototype.massupdate.php:234 #: include/views/js/configuration.discovery.edit.js.php:112 msgid "DES" @@ -4072,7 +4083,7 @@ msgstr "DNS" msgid "DNS name" msgstr "DNS名称" -#: app/views/report.services.php:34 include/forms.inc.php:1875 +#: app/views/report.services.php:34 include/forms.inc.php:2123 #: include/maintenances.inc.php:33 report4.php:107 msgid "Daily" msgstr "每日" @@ -4209,7 +4220,7 @@ msgstr "数据库类型" msgid "Database user" msgstr "数据库用户" -#: include/forms.inc.php:2004 include/forms.inc.php:2089 maintenance.php:51 +#: include/forms.inc.php:2252 include/forms.inc.php:2337 maintenance.php:51 msgid "Date" msgstr "日期" @@ -4237,16 +4248,16 @@ msgstr "日" msgid "Day before yesterday" msgstr "" -#: include/forms.inc.php:2006 include/forms.inc.php:2067 +#: include/forms.inc.php:2254 include/forms.inc.php:2315 msgid "Day of month" msgstr "月中第几日" -#: include/forms.inc.php:1908 include/forms.inc.php:2007 -#: include/forms.inc.php:2015 +#: include/forms.inc.php:2156 include/forms.inc.php:2255 +#: include/forms.inc.php:2263 msgid "Day of week" msgstr "星期几" -#: include/forms.inc.php:2116 +#: include/forms.inc.php:2364 msgid "Days" msgstr "天数" @@ -4268,7 +4279,7 @@ msgstr "调试模式已更新" msgid "Dec" msgstr "十二" -#: include/forms.inc.php:1999 include/func.inc.php:127 +#: include/forms.inc.php:2247 include/func.inc.php:127 #: include/func.inc.php:264 jsLoader.php:144 msgid "December" msgstr "十二" @@ -4298,7 +4309,7 @@ msgstr "默认延迟" msgid "Default host inventory mode" msgstr "默认主机资产记录模式" -#: app/views/administration.authentication.edit.php:41 +#: app/views/administration.authentication.edit.php:42 msgid "Default login form" msgstr "" @@ -4335,8 +4346,8 @@ msgstr "默认主题" msgid "Default theme \"%1$s\"." msgstr "默认主题 \"%1$s\"." -#: include/views/configuration.item.massupdate.php:448 -#: include/views/configuration.item.prototype.massupdate.php:426 +#: include/views/configuration.item.massupdate.php:330 +#: include/views/configuration.item.prototype.massupdate.php:326 #: include/views/monitoring.slideconf.edit.php:114 #: include/views/monitoring.slideconf.list.php:64 msgid "Delay" @@ -4419,7 +4430,7 @@ msgid "Delete dashboard?" msgstr "你确定要删除仪表盘？" #: include/views/configuration.discovery.edit.php:111 -#: include/views/configuration.host.discovery.edit.php:705 +#: include/views/configuration.host.discovery.edit.php:767 msgid "Delete discovery rule?" msgstr "删除发现规则?" @@ -4450,11 +4461,11 @@ msgstr "删除所选的 web 场景历史？" msgid "Delete icon map?" msgstr "删除图标映射?" -#: include/views/configuration.item.prototype.edit.php:1005 +#: include/views/configuration.item.prototype.edit.php:770 msgid "Delete item prototype?" msgstr "删除监控项目模板?" -#: include/views/configuration.item.edit.php:1187 +#: include/views/configuration.item.edit.php:949 msgid "Delete item?" msgstr "删除监控项?" @@ -4671,7 +4682,7 @@ msgstr "删除 web 场景？" msgid "Deleted" msgstr "已删除" -#: include/classes/api/services/CHost.php:1305 +#: include/classes/api/services/CHost.php:1341 #, c-format msgid "Deleted: Host \"%1$s\"." msgstr "已删除: 主机 \"%1$s\"." @@ -4730,13 +4741,13 @@ msgstr "部署状态" #: include/classes/screens/CScreenEvents.php:32 #: include/views/administration.auditlogs.list.php:76 #: include/views/configuration.correlation.edit.php:205 -#: include/views/configuration.host.discovery.edit.php:580 +#: include/views/configuration.host.discovery.edit.php:569 #: include/views/configuration.host.edit.php:264 #: include/views/configuration.host.massupdate.php:161 -#: include/views/configuration.item.edit.php:919 -#: include/views/configuration.item.massupdate.php:685 -#: include/views/configuration.item.prototype.edit.php:754 -#: include/views/configuration.item.prototype.massupdate.php:679 +#: include/views/configuration.item.edit.php:905 +#: include/views/configuration.item.massupdate.php:567 +#: include/views/configuration.item.prototype.edit.php:743 +#: include/views/configuration.item.prototype.massupdate.php:579 #: include/views/configuration.maintenance.edit.php:67 #: include/views/configuration.maintenance.list.php:75 #: include/views/configuration.template.edit.php:108 @@ -4907,17 +4918,15 @@ msgstr "停用的" msgid "Disaster" msgstr "灾难" -#: include/items.inc.php:1776 +#: include/items.inc.php:1785 msgid "Discard unchanged" msgstr "" -#: include/items.inc.php:1777 +#: include/items.inc.php:1789 msgid "Discard unchanged with heartbeat" msgstr "" -#: include/views/configuration.item.edit.php:1077 -#: include/views/configuration.item.prototype.edit.php:910 -#: include/views/js/common.item.edit.js.php:80 +#: include/forms.inc.php:1541 include/views/js/item.preprocessing.js.php:49 msgid "Discard value" msgstr "" @@ -4982,17 +4991,17 @@ msgstr "自动发现物件" #: app/views/monitoring.discovery.view.php:36 #: app/views/monitoring.widget.discovery.view.php:28 #: include/actions.inc.php:52 include/audit.inc.php:46 -#: include/forms.inc.php:1116 +#: include/forms.inc.php:1113 #: include/views/configuration.discovery.edit.php:102 msgid "Discovery rule" msgstr "自动发现规则" -#: include/classes/api/services/CDiscoveryRule.php:35 +#: include/classes/api/services/CDiscoveryRule.php:46 #, c-format msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template." msgstr "自动发现规则 \"%1$s\" 已存在于 \"%2$s\", 继承自其它的模板." -#: include/classes/api/services/CDiscoveryRule.php:36 +#: include/classes/api/services/CDiscoveryRule.php:47 #, c-format msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"." msgstr "发现规则\"%1$s\"已存在于 \"%2$s\"." @@ -5011,25 +5020,25 @@ msgstr "发现规则\"%1$s\"已存在" msgid "Discovery rule \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: discoveryconf.php:161 host_discovery.php:474 +#: discoveryconf.php:161 host_discovery.php:553 msgid "Discovery rule created" msgstr "自动发现规则已创建" -#: discoveryconf.php:186 host_discovery.php:274 +#: discoveryconf.php:186 host_discovery.php:278 msgid "Discovery rule deleted" msgstr "自动发现规则已删除" -#: discoveryconf.php:210 host_discovery.php:504 +#: discoveryconf.php:210 host_discovery.php:583 msgid "Discovery rule disabled" msgid_plural "Discovery rules disabled" msgstr[0] "发现规则已禁用" -#: discoveryconf.php:209 host_discovery.php:503 +#: discoveryconf.php:209 host_discovery.php:582 msgid "Discovery rule enabled" msgid_plural "Discovery rules enabled" msgstr[0] "发现规则已经启用" -#: discoveryconf.php:154 host_discovery.php:477 +#: discoveryconf.php:154 host_discovery.php:556 msgid "Discovery rule updated" msgstr "自动发现规则已更新" @@ -5044,7 +5053,7 @@ msgstr "自动发现规则已更新" msgid "Discovery rules" msgstr "自动发现规则" -#: discoveryconf.php:228 host_discovery.php:517 +#: discoveryconf.php:228 host_discovery.php:596 msgid "Discovery rules deleted" msgstr "自动发现规则已删除" @@ -5109,7 +5118,7 @@ msgstr "不要计算" msgid "Do you wish to replace the conditional expression?" msgstr "您想要替换条件式表达式吗?" -#: include/items.inc.php:1767 +#: include/items.inc.php:1769 msgid "Does not match regular expression" msgstr "" @@ -5184,7 +5193,7 @@ msgstr "在关联项中复制\"%1$s\"的值 \"%2$s\"" msgid "Duplicate \"description\" value \"%1$s\" for media type." msgstr "%1$s 媒体类型说明值重复。" -#: include/classes/api/services/CItemPrototype.php:334 +#: include/classes/api/services/CItemPrototype.php:349 #, c-format msgid "Duplicate \"name\" value \"%1$s\" for application prototype in item prototype \"%2$s\"." msgstr " \"%2$s\"与\"%1$s\"的名字有冲突。" @@ -5211,14 +5220,14 @@ msgstr "重复依赖关系在触发器 \"%1$s\" 中." msgid "Duplicate dependencies in trigger prototype \"%1$s\"." msgstr "触发器的原形依赖复制\"%1$s\"。" -#: include/classes/api/services/CHost.php:1641 -#: include/classes/api/services/CHost.php:1879 +#: include/classes/api/services/CHost.php:1677 +#: include/classes/api/services/CHost.php:1915 #, c-format msgid "Duplicate host. Host with the same host name \"%s\" already exists in data." msgstr "重复的主机. 有相同主机名称 \"%s\" 的主机已存于数据中." -#: include/classes/api/services/CHost.php:1648 -#: include/classes/api/services/CHost.php:1899 +#: include/classes/api/services/CHost.php:1684 +#: include/classes/api/services/CHost.php:1935 #, c-format msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data." msgstr "重复的主机. 有相同主机可视名称\"%s\"的主机已存于数据中." @@ -5335,8 +5344,8 @@ msgstr "可用值" msgid "Elasticsearch error: %1$s." msgstr "" -#: include/classes/api/managers/CHistoryManager.php:652 -#: include/classes/api/managers/CHistoryManager.php:661 +#: include/classes/api/managers/CHistoryManager.php:713 +#: include/classes/api/managers/CHistoryManager.php:722 #, c-format msgid "Elasticsearch url is not set for type: %1$s." msgstr "" @@ -5391,7 +5400,7 @@ msgstr "场景\"%1$s\"配置了空的SSL证书文件" msgid "Empty action condition." msgstr "空的动作条件。" -#: include/classes/api/services/CItemPrototype.php:318 +#: include/classes/api/services/CItemPrototype.php:333 #, c-format msgid "Empty application prototype name in item prototype \"%1$s\"." msgstr "该项目的原型应用名称为 \"%1$s\" 里面是空的。" @@ -5409,19 +5418,19 @@ msgstr "空的关联ID。" msgid "Empty filter condition formula ID for action \"%1$s\"." msgstr "针对动作\"%1$s\"的过滤器条件表达式ID为空" -#: include/classes/api/services/CDiscoveryRule.php:1108 +#: include/classes/api/services/CDiscoveryRule.php:1272 #, c-format msgid "Empty filter condition formula ID for discovery rule \"%1$s\"." msgstr "针对自动发现规则 \"%1$s\"的过滤器条件表达式ID为空" -#: include/classes/api/services/CDiscoveryRule.php:1100 +#: include/classes/api/services/CDiscoveryRule.php:1264 #, c-format msgid "Empty filter condition macro for discovery rule \"%1$s\"." msgstr "针对自动发现规则 \"%1$s\"的过滤器条件宏变量为空" #: include/classes/api/services/CCorrelation.php:516 #: include/classes/api/services/CCorrelation.php:693 -#: include/classes/api/services/CDiscoveryRule.php:465 +#: include/classes/api/services/CDiscoveryRule.php:480 #: include/classes/api/services/CDRule.php:187 #: include/classes/api/services/CDRule.php:313 #: include/classes/api/services/CHostInterface.php:383 @@ -5498,7 +5507,7 @@ msgstr "启用" msgid "Enable HTTP authentication" msgstr "" -#: app/views/administration.authentication.edit.php:77 +#: app/views/administration.authentication.edit.php:79 msgid "Enable LDAP authentication" msgstr "" @@ -5584,11 +5593,11 @@ msgstr "启用所选的触发器?" msgid "Enable selected web scenarios?" msgstr "启用所选定的web场景?" -#: include/views/configuration.host.discovery.edit.php:571 -#: include/views/configuration.item.edit.php:843 -#: include/views/configuration.item.massupdate.php:568 -#: include/views/configuration.item.prototype.edit.php:716 -#: include/views/configuration.item.prototype.massupdate.php:549 +#: include/views/configuration.host.discovery.edit.php:560 +#: include/views/configuration.item.edit.php:828 +#: include/views/configuration.item.massupdate.php:450 +#: include/views/configuration.item.prototype.edit.php:705 +#: include/views/configuration.item.prototype.massupdate.php:449 msgid "Enable trapping" msgstr "" @@ -5618,12 +5627,12 @@ msgstr "" #: include/views/configuration.correlation.list.php:104 #: include/views/configuration.discovery.edit.php:99 #: include/views/configuration.discovery.list.php:44 -#: include/views/configuration.host.discovery.edit.php:586 +#: include/views/configuration.host.discovery.edit.php:572 #: include/views/configuration.host.edit.php:280 #: include/views/configuration.host.list.php:186 #: include/views/configuration.host.massupdate.php:185 #: include/views/configuration.httpconf.edit.php:143 -#: include/views/configuration.item.edit.php:928 +#: include/views/configuration.item.edit.php:911 #: include/views/configuration.triggers.edit.php:575 msgid "Enabled" msgstr "已启用" @@ -5656,7 +5665,7 @@ msgstr "英语(en_US)" msgid "Equals" msgstr "" -#: include/items.inc.php:35 include/views/js/common.item.edit.js.php:730 +#: include/items.inc.php:35 include/views/js/common.item.edit.js.php:321 #: include/views/js/configuration.httpconf.edit.js.php:577 #: include/views/js/configuration.httpconf.edit.js.php:652 msgid "Error" @@ -5735,11 +5744,11 @@ msgstr[0] "" msgid "Events and alerts" msgstr "事件和报警" -#: include/forms.inc.php:1889 +#: include/forms.inc.php:2137 msgid "Every day(s)" msgstr "每日" -#: include/forms.inc.php:1902 +#: include/forms.inc.php:2150 msgid "Every week(s)" msgstr "每周" @@ -5783,9 +5792,9 @@ msgid "Executed" msgstr "已执行" #: include/items.inc.php:1678 -#: include/views/configuration.host.discovery.edit.php:494 -#: include/views/configuration.item.edit.php:641 -#: include/views/configuration.item.prototype.edit.php:573 +#: include/views/configuration.host.discovery.edit.php:483 +#: include/views/configuration.item.edit.php:628 +#: include/views/configuration.item.prototype.edit.php:560 msgid "Executed script" msgstr "已执行的脚本" @@ -5872,8 +5881,8 @@ msgstr "表达式不能为空白" msgid "Expression constructor" msgstr "表达式构造器" -#: include/forms.inc.php:1647 include/forms.inc.php:1652 -#: include/forms.inc.php:1660 +#: include/forms.inc.php:1895 include/forms.inc.php:1900 +#: include/forms.inc.php:1908 msgid "Expression syntax error." msgstr "表达式语法错误。" @@ -5926,7 +5935,7 @@ msgstr "已失败" msgid "Failed to create dashboard" msgstr "创建仪表盘失败" -#: include/views/js/common.item.edit.js.php:732 +#: include/views/js/common.item.edit.js.php:323 #: include/views/js/configuration.httpconf.edit.js.php:654 msgid "Failed to parse URL." msgstr "无法解析URL。" @@ -5963,7 +5972,7 @@ msgstr "常用的聚合图形" msgid "Feb" msgstr "二月" -#: include/forms.inc.php:1964 include/func.inc.php:117 +#: include/forms.inc.php:2212 include/func.inc.php:117 #: include/func.inc.php:254 jsLoader.php:134 msgid "February" msgstr "二月" @@ -5983,9 +5992,9 @@ msgstr "字段 \"%1$s\"不能被设置为空" #: include/classes/api/services/CDRule.php:318 #: include/classes/api/services/CDRule.php:493 #: include/classes/api/services/CDRule.php:503 -#: include/classes/api/services/CHostGroup.php:897 +#: include/classes/api/services/CHostGroup.php:914 #: include/classes/api/services/CHost.php:743 -#: include/classes/api/services/CTemplate.php:784 +#: include/classes/api/services/CTemplate.php:782 #: include/classes/api/services/CTriggerGeneral.php:236 #: include/classes/validators/CNewValidator.php:255 #: include/validate.inc.php:300 @@ -6122,8 +6131,8 @@ msgstr "填满的区域" msgid "Filter" msgstr "过滤器" -#: include/views/configuration.host.discovery.edit.php:679 -#: include/views/configuration.host.discovery.edit.php:688 +#: include/views/configuration.host.discovery.edit.php:667 +#: include/views/configuration.host.discovery.edit.php:749 msgid "Filters" msgstr "过滤器" @@ -6169,21 +6178,21 @@ msgstr "调整至符合拓扑图" msgid "Fixed" msgstr "固定的" -#: include/views/configuration.host.discovery.edit.php:523 -#: include/views/configuration.item.edit.php:707 -#: include/views/configuration.item.edit.php:714 -#: include/views/configuration.item.massupdate.php:465 -#: include/views/configuration.item.prototype.edit.php:634 -#: include/views/configuration.item.prototype.massupdate.php:443 +#: include/views/configuration.host.discovery.edit.php:511 +#: include/views/configuration.item.edit.php:694 +#: include/views/configuration.item.edit.php:701 +#: include/views/configuration.item.massupdate.php:347 +#: include/views/configuration.item.prototype.edit.php:621 +#: include/views/configuration.item.prototype.massupdate.php:343 #: include/views/js/common.item.edit.js.php:7 -#: include/views/js/configuration.item.massupdate.js.php:7 +#: include/views/js/configuration.item.massupdate.js.php:11 msgid "Flexible" msgstr "灵活" #: app/views/popup.httpstep.php:135 -#: include/views/configuration.host.discovery.edit.php:250 -#: include/views/configuration.item.edit.php:282 -#: include/views/configuration.item.prototype.edit.php:270 +#: include/views/configuration.host.discovery.edit.php:244 +#: include/views/configuration.item.edit.php:279 +#: include/views/configuration.item.prototype.edit.php:264 msgid "Follow redirects" msgstr "跟随跳转" @@ -6209,8 +6218,8 @@ msgstr "访客的密码必须为空" msgid "Form data" msgstr "表格资料" -#: include/items.inc.php:1682 include/views/configuration.item.edit.php:657 -#: include/views/configuration.item.prototype.edit.php:587 +#: include/items.inc.php:1682 include/views/configuration.item.edit.php:644 +#: include/views/configuration.item.prototype.edit.php:574 msgid "Formula" msgstr "公式" @@ -6222,7 +6231,7 @@ msgstr "法语 (fr_FR)" msgid "Fri" msgstr "周五" -#: include/forms.inc.php:1932 include/forms.inc.php:2047 +#: include/forms.inc.php:2180 include/forms.inc.php:2295 #: include/func.inc.php:139 include/func.inc.php:229 jsLoader.php:149 msgid "Friday" msgstr "周五" @@ -6598,12 +6607,12 @@ msgstr "网格" msgid "Group" msgstr "群组" -#: include/classes/api/services/CHostGroup.php:551 +#: include/classes/api/services/CHostGroup.php:715 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "组\"%1$s\" 不可以被删除，因为它正在被主机模板使用" -#: include/classes/api/services/CHostGroup.php:600 +#: include/classes/api/services/CHostGroup.php:764 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "\"%1$s\" 组因为他的关联条件无法删除。" @@ -6692,26 +6701,26 @@ msgstr "HTTP" msgid "HTTP agent" msgstr "" -#: include/views/configuration.host.discovery.edit.php:280 +#: include/views/configuration.host.discovery.edit.php:271 #: include/views/configuration.httpconf.edit.php:154 -#: include/views/configuration.item.edit.php:321 -#: include/views/configuration.item.prototype.edit.php:309 +#: include/views/configuration.item.edit.php:314 +#: include/views/configuration.item.prototype.edit.php:299 msgid "HTTP authentication" msgstr "HTTP认证" -#: app/views/administration.authentication.edit.php:44 +#: app/views/administration.authentication.edit.php:45 msgid "HTTP login form" msgstr "" -#: include/views/configuration.host.discovery.edit.php:271 +#: include/views/configuration.host.discovery.edit.php:263 #: include/views/configuration.httpconf.edit.php:110 #: include/views/configuration.httpconf.list.php:93 -#: include/views/configuration.item.edit.php:312 -#: include/views/configuration.item.prototype.edit.php:300 +#: include/views/configuration.item.edit.php:306 +#: include/views/configuration.item.prototype.edit.php:291 msgid "HTTP proxy" msgstr "HTTP 代理" -#: app/views/administration.authentication.edit.php:136 +#: app/views/administration.authentication.edit.php:146 msgid "HTTP settings" msgstr "" @@ -6738,14 +6747,14 @@ msgid "Hardware sensor reading. Returns float" msgstr "硬件传感器读数。返回浮点型" #: app/views/popup.httpstep.php:95 app/views/popup.httpstep.php:143 -#: include/views/configuration.host.discovery.edit.php:201 -#: include/views/configuration.host.discovery.edit.php:262 +#: include/views/configuration.host.discovery.edit.php:197 +#: include/views/configuration.host.discovery.edit.php:255 #: include/views/configuration.httpconf.edit.php:117 -#: include/views/configuration.item.edit.php:233 -#: include/views/configuration.item.edit.php:294 -#: include/views/configuration.item.massupdate.php:149 -#: include/views/configuration.item.prototype.edit.php:221 -#: include/views/configuration.item.prototype.edit.php:282 +#: include/views/configuration.item.edit.php:232 +#: include/views/configuration.item.edit.php:290 +#: include/views/configuration.item.massupdate.php:147 +#: include/views/configuration.item.prototype.edit.php:217 +#: include/views/configuration.item.prototype.edit.php:275 #: include/views/configuration.item.prototype.massupdate.php:143 msgid "Headers" msgstr "头" @@ -6769,7 +6778,7 @@ msgstr "高" msgid "Help" msgstr "帮助" -#: include/items.inc.php:1759 +#: include/items.inc.php:1757 msgid "Hexadecimal to decimal" msgstr "十六进制到十进制" @@ -6828,12 +6837,12 @@ msgid "History" msgstr "历史记录" #: httpconf.php:191 httpconf.php:198 httpconf.php:492 httpconf.php:504 -#: items.php:992 items.php:999 items.php:1382 items.php:1394 +#: items.php:992 items.php:999 items.php:1383 items.php:1395 msgid "History cleared" msgstr "历史已清除" #: include/views/configuration.httpconf.edit.php:298 -#: include/views/configuration.item.edit.php:1183 +#: include/views/configuration.item.edit.php:945 msgid "History clearing can take a long time. Continue?" msgstr "历史清除可能会很久。继续吗?" @@ -6854,10 +6863,10 @@ msgstr "历史数据存储期 \"%1$s\"。" msgid "History of events" msgstr "事件历史" -#: disc_prototypes.php:193 include/views/configuration.item.edit.php:783 -#: include/views/configuration.item.massupdate.php:518 -#: include/views/configuration.item.prototype.edit.php:680 -#: include/views/configuration.item.prototype.massupdate.php:496 items.php:61 +#: disc_prototypes.php:193 include/views/configuration.item.edit.php:770 +#: include/views/configuration.item.massupdate.php:400 +#: include/views/configuration.item.prototype.edit.php:667 +#: include/views/configuration.item.prototype.massupdate.php:396 items.php:61 msgid "History storage period" msgstr "历史数据保留时长" @@ -6914,7 +6923,7 @@ msgstr "横向对齐" #: include/views/monitoring.screen.constructor.edit.php:524 #: include/views/monitoring.screen.php:78 #: include/views/monitoring.slides.php:74 -#: include/views/reports.toptriggers.php:79 items.php:992 items.php:1381 +#: include/views/reports.toptriggers.php:79 items.php:992 items.php:1382 #: jsLoader.php:165 latest.php:421 latest.php:438 queue.php:254 #: report2.php:409 report2.php:431 msgid "Host" @@ -6928,10 +6937,10 @@ msgstr[0] "主机" msgid "Host \"%1$s\" already exists." msgstr "主机 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:1449 +#: include/classes/api/services/CHostGroup.php:1466 #: include/classes/api/services/CHost.php:806 -#: include/classes/api/services/CHost.php:1629 -#: include/classes/api/services/CHost.php:1805 +#: include/classes/api/services/CHost.php:1665 +#: include/classes/api/services/CHost.php:1841 #, c-format msgid "Host \"%1$s\" cannot be without host group." msgstr "主机 \"%1$s\" 没有设置主机组" @@ -7001,17 +7010,17 @@ msgstr[0] "主机已启用" msgid "Host group" msgstr "主机群组" -#: include/classes/api/services/CHostGroup.php:731 +#: include/classes/api/services/CHostGroup.php:643 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "主机群组 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:584 +#: include/classes/api/services/CHostGroup.php:748 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "主机群组“%1$s”不能被删除，因为它被用于全局脚本" -#: include/classes/api/services/CHostGroup.php:537 +#: include/classes/api/services/CHostGroup.php:701 #, c-format msgid "Host group \"%1$s\" is internal and can not be deleted." msgstr "主机群组 \"%1$s\" 为内建的且不能被删除" @@ -7059,11 +7068,11 @@ msgstr "主机群组" msgid "Host info" msgstr "主机信息" -#: include/views/configuration.host.discovery.edit.php:387 -#: include/views/configuration.item.edit.php:435 -#: include/views/configuration.item.edit.php:479 -#: include/views/configuration.item.massupdate.php:85 -#: include/views/configuration.item.prototype.edit.php:466 +#: include/views/configuration.host.discovery.edit.php:366 +#: include/views/configuration.item.edit.php:420 +#: include/views/configuration.item.edit.php:464 +#: include/views/configuration.item.massupdate.php:84 +#: include/views/configuration.item.prototype.edit.php:449 #: include/views/configuration.item.prototype.massupdate.php:80 msgid "Host interface" msgstr "主机接口" @@ -7189,25 +7198,25 @@ msgstr "主机已更新" msgid "Host with ID \"%1$s\" is not available." msgstr "ID为 \"%1$s\" 的主机不可用" -#: include/classes/api/services/CTemplate.php:1056 +#: include/classes/api/services/CTemplate.php:1054 #, c-format msgid "Host with the same name \"%1$s\" already exists." msgstr "主机名称为\"%1$s\"的主机已存在" -#: include/classes/api/services/CHost.php:1736 -#: include/classes/api/services/CHost.php:1955 +#: include/classes/api/services/CHost.php:1772 +#: include/classes/api/services/CHost.php:1991 #, c-format msgid "Host with the same name \"%s\" already exists." msgstr "名称同样为 \"%s\" 的主机已存在." #: include/classes/api/services/CTemplate.php:460 -#: include/classes/api/services/CTemplate.php:1021 +#: include/classes/api/services/CTemplate.php:1019 #, c-format msgid "Host with the same visible name \"%1$s\" already exists." msgstr "显示名称为\"%1$s\" 的主机已经存在" -#: include/classes/api/services/CHost.php:1742 -#: include/classes/api/services/CHost.php:1962 +#: include/classes/api/services/CHost.php:1778 +#: include/classes/api/services/CHost.php:1998 #, c-format msgid "Host with the same visible name \"%s\" already exists." msgstr "可视名称同样为 \"%s\" 的主机已存在." @@ -7255,7 +7264,7 @@ msgstr "主机位置" msgid "Hosts updated" msgstr "主机已更新" -#: include/forms.inc.php:2118 +#: include/forms.inc.php:2366 msgid "Hours" msgstr "时" @@ -7354,9 +7363,9 @@ msgid "IPMI scripts can be executed only by server." msgstr "IPMI脚本只能由服务器运行。" #: disc_prototypes.php:162 host_discovery.php:136 -#: include/views/configuration.host.discovery.edit.php:452 -#: include/views/configuration.item.edit.php:591 -#: include/views/configuration.item.prototype.edit.php:531 items.php:172 +#: include/views/configuration.host.discovery.edit.php:440 +#: include/views/configuration.item.edit.php:577 +#: include/views/configuration.item.prototype.edit.php:517 items.php:172 msgid "IPMI sensor" msgstr "IPMI传感器" @@ -7536,7 +7545,7 @@ msgstr "维修中" msgid "In progress" msgstr "启用中" -#: include/items.inc.php:1765 +#: include/items.inc.php:1761 msgid "In range" msgstr "" @@ -7556,6 +7565,10 @@ msgstr "无法访问的主机" msgid "Inaccessible item" msgstr "无法访问的项" +#: include/classes/screens/CScreenProblem.php:393 +msgid "Inaccessible maintenance" +msgstr "" + #: app/controllers/CControllerDashboardWidgetEdit.php:103 #: app/controllers/CControllerWidgetNavTreeItemEdit.php:84 msgid "Inaccessible map" @@ -7829,18 +7842,18 @@ msgstr "函数传入了错误的参数" #: include/classes/api/services/CHostPrototype.php:392 #: include/classes/api/services/CHostPrototype.php:413 #: include/classes/api/services/CItemGeneral.php:258 -#: include/classes/api/services/CItemGeneral.php:1171 -#: include/classes/api/services/CItemGeneral.php:1196 -#: include/classes/api/services/CItemGeneral.php:1219 -#: include/classes/api/services/CItemGeneral.php:1249 -#: include/classes/api/services/CItemGeneral.php:1263 -#: include/classes/api/services/CItemGeneral.php:1289 -#: include/classes/api/services/CItemGeneral.php:1335 -#: include/classes/api/services/CItemGeneral.php:1358 -#: include/classes/api/services/CItemGeneral.php:1409 -#: include/classes/api/services/CItemGeneral.php:1420 -#: include/classes/api/services/CItemGeneral.php:1435 -#: include/classes/api/services/CItemGeneral.php:1446 +#: include/classes/api/services/CItemGeneral.php:1261 +#: include/classes/api/services/CItemGeneral.php:1286 +#: include/classes/api/services/CItemGeneral.php:1309 +#: include/classes/api/services/CItemGeneral.php:1339 +#: include/classes/api/services/CItemGeneral.php:1353 +#: include/classes/api/services/CItemGeneral.php:1379 +#: include/classes/api/services/CItemGeneral.php:1425 +#: include/classes/api/services/CItemGeneral.php:1448 +#: include/classes/api/services/CItemGeneral.php:1499 +#: include/classes/api/services/CItemGeneral.php:1510 +#: include/classes/api/services/CItemGeneral.php:1525 +#: include/classes/api/services/CItemGeneral.php:1536 #: include/classes/api/services/CMapElement.php:46 #: include/classes/api/services/CMapElement.php:90 #: include/classes/api/services/CMapElement.php:109 @@ -7882,8 +7895,8 @@ msgid "Incorrect calculate SLA value for service \"%1$s\"." msgstr "服务\"%1$s\"出现了错误的计算SLA值." #: include/classes/api/services/CHost.php:826 -#: include/classes/api/services/CHost.php:1617 -#: include/classes/api/services/CHost.php:1873 +#: include/classes/api/services/CHost.php:1653 +#: include/classes/api/services/CHost.php:1909 #, c-format msgid "Incorrect characters used for host name \"%s\"." msgstr "错误的字符串用于主机名称\"%s\"." @@ -7895,7 +7908,7 @@ msgid "Incorrect characters used for proxy name \"%1$s\"." msgstr "代理名\"%1$s\" 使用了错误的字符." #: include/classes/api/services/CTemplate.php:411 -#: include/classes/api/services/CTemplate.php:1064 +#: include/classes/api/services/CTemplate.php:1062 #, c-format msgid "Incorrect characters used for template name \"%1$s\"." msgstr "模板名称\"%1$s\"使用了不正确的名称." @@ -7905,7 +7918,7 @@ msgstr "模板名称\"%1$s\"使用了不正确的名称." msgid "Incorrect conditions for action \"%1$s\"." msgstr "动作\"%1$s\"的条件不正确" -#: include/classes/api/services/CDiscoveryRule.php:1074 +#: include/classes/api/services/CDiscoveryRule.php:1238 #, c-format msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "自动发现规则\"%1$s\"的条件不正确." @@ -7924,7 +7937,7 @@ msgstr "动作\"%1$s\": %3$s自定义的表达式\"%2$s\" 不正确." msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." msgstr "在关联项\"%1$s\": %3$s中使用了错误的表达式\"%2$s\"。" -#: include/classes/api/services/CDiscoveryRule.php:1079 +#: include/classes/api/services/CDiscoveryRule.php:1243 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." msgstr "自动发现规则\"%1$s\": %3$s自定义的表达式 \"%2$s\"不正确." @@ -7969,7 +7982,7 @@ msgstr "错误的文件上传." msgid "Incorrect filter condition formula ID for action \"%1$s\"." msgstr "动作\"%1$s\"的过滤器条件计算式ID不正确." -#: include/classes/api/services/CDiscoveryRule.php:1109 +#: include/classes/api/services/CDiscoveryRule.php:1273 #, c-format msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "自动发现规则\"%1$s\"的条件计算式ID不正确." @@ -7979,7 +7992,7 @@ msgstr "自动发现规则\"%1$s\"的条件计算式ID不正确." msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." msgstr "错误的过滤条件公式给出相关ID \"%1$s\" 。" -#: include/classes/api/services/CDiscoveryRule.php:1101 +#: include/classes/api/services/CDiscoveryRule.php:1265 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." msgstr "自动发现规则\"%1$s\"的过滤器条件宏变量不正确" @@ -7989,7 +8002,7 @@ msgstr "自动发现规则\"%1$s\"的过滤器条件宏变量不正确" msgid "Incorrect filter condition operator for action \"%1$s\"." msgstr "动作\"%1$s\"过滤器条件行为不正确." -#: include/classes/api/services/CDiscoveryRule.php:1113 +#: include/classes/api/services/CDiscoveryRule.php:1277 #, c-format msgid "Incorrect filter condition operator for discovery rule \"%1$s\"." msgstr "自动发现规则\"%1$s\"的过滤器条件行为不正确" @@ -8037,8 +8050,8 @@ msgstr "错误的图片索引" #: include/classes/api/services/CAction.php:2821 #: include/classes/api/services/CAction.php:2833 #: include/classes/api/services/CHost.php:812 -#: include/classes/api/services/CHost.php:1611 -#: include/classes/api/services/CHost.php:1792 +#: include/classes/api/services/CHost.php:1647 +#: include/classes/api/services/CHost.php:1828 #: include/classes/api/services/CImage.php:485 #: include/classes/api/services/CProxy.php:618 #: include/classes/api/services/CProxy.php:682 @@ -8061,8 +8074,8 @@ msgstr "提供了错误的DNS参数\"%s\"." msgid "Incorrect interface port \"%s\" provided." msgstr "提供了错误的端口\"%s\"." -#: include/classes/api/services/CHost.php:1711 -#: include/classes/api/services/CHost.php:1855 +#: include/classes/api/services/CHost.php:1747 +#: include/classes/api/services/CHost.php:1891 #, c-format msgid "Incorrect inventory field \"%s\"." msgstr "错误的资产纪录栏位\"%s\"." @@ -8100,7 +8113,7 @@ msgstr "" msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"." msgstr "提供错误的项目值类型\"%1$s\"给触发器函数\"%2$s\"." -#: include/forms.inc.php:1393 +#: include/forms.inc.php:1641 msgid "Incorrect list of items." msgstr "错误的监控项列表" @@ -8257,8 +8270,8 @@ msgstr "服务\"%1$s\" 中的排序不正确。" msgid "Incorrect source value." msgstr "错误的源值." -#: include/classes/api/services/CHost.php:1683 -#: include/classes/api/services/CHost.php:1823 +#: include/classes/api/services/CHost.php:1719 +#: include/classes/api/services/CHost.php:1859 #, c-format msgid "Incorrect status for host \"%1$s\"." msgstr "主机\"%1$s\"的状态值不正确." @@ -8331,7 +8344,7 @@ msgstr "动作\"%1$s\"的计算类型不正确." msgid "Incorrect type of calculation for correlation \"%1$s\"." msgstr "\"%1$s\"的关联项计算类型错误。" -#: include/classes/api/services/CDiscoveryRule.php:1067 +#: include/classes/api/services/CDiscoveryRule.php:1231 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." msgstr "自动发现规则 \"%1$s\"的计算类型不正确." @@ -8371,7 +8384,7 @@ msgstr "错误的用户群组." #: include/classes/api/services/CAction.php:1745 #: include/classes/api/services/CAction.php:2777 #: include/classes/api/services/CAction.php:2921 -#: include/classes/api/services/CDiscoveryRule.php:1015 +#: include/classes/api/services/CDiscoveryRule.php:1179 #: include/classes/api/services/CDRule.php:237 #: include/classes/api/services/CDRule.php:244 #: include/classes/api/services/CDRule.php:292 @@ -8382,7 +8395,7 @@ msgstr "错误的用户群组." #: include/classes/api/services/CDRule.php:558 #: include/classes/api/services/CDRule.php:571 #: include/classes/api/services/CItemGeneral.php:529 -#: include/classes/api/services/CItemGeneral.php:2206 +#: include/classes/api/services/CItemGeneral.php:2169 #: include/classes/validators/CNewValidator.php:116 #: include/classes/validators/CNewValidator.php:129 #: include/classes/validators/CNewValidator.php:142 @@ -8397,7 +8410,7 @@ msgstr "错误的用户群组." msgid "Incorrect value \"%1$s\" for \"%2$s\" field." msgstr "字段 \"%2$s\"的值 \"%1$s\"不正确." -#: app/controllers/CControllerAuthenticationUpdate.php:132 +#: app/controllers/CControllerAuthenticationUpdate.php:134 #: include/classes/api/services/CAction.php:1678 #: include/classes/api/services/CScreenItem.php:576 #: include/validate.inc.php:351 @@ -8480,8 +8493,8 @@ msgstr "" #: include/classes/api/services/CCorrelation.php:1101 #: include/classes/api/services/CCorrelation.php:1118 #: include/classes/api/services/CCorrelation.php:1137 -#: include/classes/api/services/CDiscoveryRule.php:1135 -#: include/classes/api/services/CDiscoveryRule.php:1359 +#: include/classes/api/services/CDiscoveryRule.php:1299 +#: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDRule.php:203 #: include/classes/api/services/CDRule.php:209 #: include/classes/api/services/CDRule.php:214 @@ -8501,21 +8514,19 @@ msgstr "" #: include/classes/api/services/CEvent.php:804 #: include/classes/api/services/CEvent.php:847 #: include/classes/api/services/CEvent.php:904 -#: include/classes/api/services/CHostGeneral.php:1023 -#: include/classes/api/services/CHostGeneral.php:1030 #: include/classes/api/services/CHost.php:770 -#: include/classes/api/services/CHost.php:1515 -#: include/classes/api/services/CHost.php:1521 -#: include/classes/api/services/CHost.php:1536 -#: include/classes/api/services/CHost.php:1542 -#: include/classes/api/services/CHost.php:1547 -#: include/classes/api/services/CHost.php:1553 -#: include/classes/api/services/CHost.php:1561 -#: include/classes/api/services/CHost.php:1567 -#: include/classes/api/services/CHost.php:1576 -#: include/classes/api/services/CHost.php:1582 -#: include/classes/api/services/CHost.php:1677 -#: include/classes/api/services/CHost.php:1817 +#: include/classes/api/services/CHost.php:1551 +#: include/classes/api/services/CHost.php:1557 +#: include/classes/api/services/CHost.php:1572 +#: include/classes/api/services/CHost.php:1578 +#: include/classes/api/services/CHost.php:1583 +#: include/classes/api/services/CHost.php:1589 +#: include/classes/api/services/CHost.php:1597 +#: include/classes/api/services/CHost.php:1603 +#: include/classes/api/services/CHost.php:1612 +#: include/classes/api/services/CHost.php:1618 +#: include/classes/api/services/CHost.php:1713 +#: include/classes/api/services/CHost.php:1853 #: include/classes/api/services/CHttpTest.php:967 #: include/classes/api/services/CHttpTest.php:982 #: include/classes/api/services/CHttpTest.php:1076 @@ -8529,40 +8540,36 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:517 #: include/classes/api/services/CItemGeneral.php:523 #: include/classes/api/services/CItemGeneral.php:536 -#: include/classes/api/services/CItemGeneral.php:1201 -#: include/classes/api/services/CItemGeneral.php:1207 -#: include/classes/api/services/CItemGeneral.php:1223 -#: include/classes/api/services/CItemGeneral.php:1232 -#: include/classes/api/services/CItemGeneral.php:1254 -#: include/classes/api/services/CItemGeneral.php:1268 -#: include/classes/api/services/CItemGeneral.php:1275 -#: include/classes/api/services/CItemGeneral.php:1281 -#: include/classes/api/services/CItemGeneral.php:1294 -#: include/classes/api/services/CItemGeneral.php:1305 -#: include/classes/api/services/CItemGeneral.php:1315 +#: include/classes/api/services/CItemGeneral.php:1291 +#: include/classes/api/services/CItemGeneral.php:1297 +#: include/classes/api/services/CItemGeneral.php:1313 #: include/classes/api/services/CItemGeneral.php:1322 -#: include/classes/api/services/CItemGeneral.php:1340 -#: include/classes/api/services/CItemGeneral.php:1363 -#: include/classes/api/services/CItemGeneral.php:1413 -#: include/classes/api/services/CItemGeneral.php:1426 -#: include/classes/api/services/CItemGeneral.php:1439 -#: include/classes/api/services/CItemGeneral.php:1454 -#: include/classes/api/services/CItemGeneral.php:1464 -#: include/classes/api/services/CItemGeneral.php:1688 -#: include/classes/api/services/CItemGeneral.php:1729 -#: include/classes/api/services/CItemGeneral.php:1735 -#: include/classes/api/services/CItemGeneral.php:1752 -#: include/classes/api/services/CItemGeneral.php:1759 -#: include/classes/api/services/CItemGeneral.php:1765 -#: include/classes/api/services/CItemGeneral.php:1850 -#: include/classes/api/services/CItemGeneral.php:1859 -#: include/classes/api/services/CItemGeneral.php:1972 -#: include/classes/api/services/CItemGeneral.php:1979 -#: include/classes/api/services/CItemGeneral.php:2145 -#: include/classes/api/services/CItem.php:774 -#: include/classes/api/services/CItem.php:782 -#: include/classes/api/services/CItemPrototype.php:944 -#: include/classes/api/services/CItemPrototype.php:952 +#: include/classes/api/services/CItemGeneral.php:1344 +#: include/classes/api/services/CItemGeneral.php:1358 +#: include/classes/api/services/CItemGeneral.php:1365 +#: include/classes/api/services/CItemGeneral.php:1371 +#: include/classes/api/services/CItemGeneral.php:1384 +#: include/classes/api/services/CItemGeneral.php:1395 +#: include/classes/api/services/CItemGeneral.php:1405 +#: include/classes/api/services/CItemGeneral.php:1412 +#: include/classes/api/services/CItemGeneral.php:1430 +#: include/classes/api/services/CItemGeneral.php:1453 +#: include/classes/api/services/CItemGeneral.php:1503 +#: include/classes/api/services/CItemGeneral.php:1516 +#: include/classes/api/services/CItemGeneral.php:1529 +#: include/classes/api/services/CItemGeneral.php:1544 +#: include/classes/api/services/CItemGeneral.php:1554 +#: include/classes/api/services/CItemGeneral.php:1810 +#: include/classes/api/services/CItemGeneral.php:1830 +#: include/classes/api/services/CItemGeneral.php:1837 +#: include/classes/api/services/CItemGeneral.php:1847 +#: include/classes/api/services/CItemGeneral.php:1927 +#: include/classes/api/services/CItemGeneral.php:1941 +#: include/classes/api/services/CItemGeneral.php:2108 +#: include/classes/api/services/CItem.php:787 +#: include/classes/api/services/CItem.php:795 +#: include/classes/api/services/CItemPrototype.php:958 +#: include/classes/api/services/CItemPrototype.php:966 #: include/classes/api/services/CMaintenance.php:468 #: include/classes/api/services/CMaintenance.php:637 #: include/classes/api/services/CMapElement.php:74 @@ -8628,12 +8635,12 @@ msgstr "" #: include/classes/helpers/CSvgGraphHelper.php:248 #: include/classes/import/CConfigurationImport.php:807 #: include/classes/import/CConfigurationImport.php:845 -#: include/classes/import/CConfigurationImport.php:2460 -#: include/classes/import/CConfigurationImport.php:2564 -#: include/classes/import/CConfigurationImport.php:2574 -#: include/classes/import/CConfigurationImport.php:2610 -#: include/classes/import/CConfigurationImport.php:2619 -#: include/classes/import/CConfigurationImport.php:2625 +#: include/classes/import/CConfigurationImport.php:2468 +#: include/classes/import/CConfigurationImport.php:2572 +#: include/classes/import/CConfigurationImport.php:2582 +#: include/classes/import/CConfigurationImport.php:2618 +#: include/classes/import/CConfigurationImport.php:2627 +#: include/classes/import/CConfigurationImport.php:2633 #: include/classes/validators/CNewValidator.php:91 #: include/classes/validators/CNewValidator.php:101 #: include/classes/validators/CNewValidator.php:266 @@ -8646,7 +8653,7 @@ msgstr "" msgid "Incorrect value for field \"%1$s\": %2$s." msgstr "字段 \"%1$s\": %2$s 值错误。" -#: app/controllers/CControllerAuthenticationUpdate.php:124 +#: app/controllers/CControllerAuthenticationUpdate.php:126 #: app/controllers/CControllerPopupTriggerWizard.php:125 #: include/validate.inc.php:346 #, c-format @@ -8814,15 +8821,15 @@ msgid "Internet Explorer" msgstr "IE浏览器" #: include/forms.inc.php:882 include/views/configuration.discovery.list.php:62 -#: include/views/configuration.host.discovery.edit.php:518 +#: include/views/configuration.host.discovery.edit.php:506 #: include/views/configuration.host.discovery.list.php:57 #: include/views/configuration.httpconf.list.php:90 -#: include/views/configuration.item.edit.php:700 +#: include/views/configuration.item.edit.php:687 #: include/views/configuration.item.list.php:66 -#: include/views/configuration.item.massupdate.php:456 -#: include/views/configuration.item.prototype.edit.php:629 +#: include/views/configuration.item.massupdate.php:338 +#: include/views/configuration.item.prototype.edit.php:616 #: include/views/configuration.item.prototype.list.php:54 -#: include/views/configuration.item.prototype.massupdate.php:434 +#: include/views/configuration.item.prototype.massupdate.php:334 #: include/views/configuration.services.edit.php:170 latest.php:423 msgid "Interval" msgstr "间隔" @@ -8913,24 +8920,24 @@ msgstr "内部存储期 %1$s 无效。" #: disc_prototypes.php:394 disc_prototypes.php:399 disc_prototypes.php:412 #: disc_prototypes.php:730 disc_prototypes.php:735 disc_prototypes.php:748 -#: host_discovery.php:310 host_discovery.php:315 host_discovery.php:328 +#: host_discovery.php:315 host_discovery.php:320 host_discovery.php:333 #: items.php:617 items.php:622 items.php:635 items.php:1025 items.php:1030 #: items.php:1043 #, c-format msgid "Invalid interval \"%1$s\"." msgstr "无效的间隔 \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:37 +#: include/classes/api/services/CDiscoveryRule.php:48 #, c-format msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s." msgstr " \"%3$s\": %4$s上的自动发现规则\"%2$s\"引用了不合法的关键字\"%1$s\"" -#: include/classes/api/services/CItem.php:37 +#: include/classes/api/services/CItem.php:52 #, c-format msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s." msgstr "\"%3$s\": %4$s上的监控项目 \"%2$s\"使用了不合法的关键字 \"%1$s\"" -#: include/classes/api/services/CItemPrototype.php:37 +#: include/classes/api/services/CItemPrototype.php:52 #, c-format msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s." msgstr " \"%3$s\": %4$s上的监控项目模板 \"%2$s\"使用了不合法的关键字\"%1$s\"" @@ -8973,65 +8980,72 @@ msgstr "无效的参数个数." #: app/controllers/CControllerDashboardUpdate.php:125 #: app/controllers/CControllerDashboardUpdate.php:134 #: app/controllers/CControllerDashboardUpdate.php:142 -#: include/classes/api/services/CItemGeneral.php:2161 -#: include/classes/api/services/CItemGeneral.php:2168 -#: include/classes/api/services/CItemGeneral.php:2176 -#: include/classes/api/services/CItemGeneral.php:2185 -#: include/classes/api/services/CItemGeneral.php:2192 +#: include/classes/api/services/CDiscoveryRule.php:1319 +#: include/classes/api/services/CDiscoveryRule.php:1405 +#: include/classes/api/services/CDiscoveryRule.php:1422 +#: include/classes/api/services/CDiscoveryRule.php:1440 +#: include/classes/api/services/CDiscoveryRule.php:1448 +#: include/classes/api/services/CItemGeneral.php:2124 +#: include/classes/api/services/CItemGeneral.php:2131 +#: include/classes/api/services/CItemGeneral.php:2139 +#: include/classes/api/services/CItemGeneral.php:2148 +#: include/classes/api/services/CItemGeneral.php:2155 #: include/classes/api/services/CUser.php:649 #: include/classes/api/services/CUser.php:660 -#: include/classes/validators/CApiInputValidator.php:230 -#: include/classes/validators/CApiInputValidator.php:235 -#: include/classes/validators/CApiInputValidator.php:240 -#: include/classes/validators/CApiInputValidator.php:270 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:338 -#: include/classes/validators/CApiInputValidator.php:370 -#: include/classes/validators/CApiInputValidator.php:375 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:422 -#: include/classes/validators/CApiInputValidator.php:475 -#: include/classes/validators/CApiInputValidator.php:508 -#: include/classes/validators/CApiInputValidator.php:513 -#: include/classes/validators/CApiInputValidator.php:554 -#: include/classes/validators/CApiInputValidator.php:559 -#: include/classes/validators/CApiInputValidator.php:564 -#: include/classes/validators/CApiInputValidator.php:593 -#: include/classes/validators/CApiInputValidator.php:648 -#: include/classes/validators/CApiInputValidator.php:655 -#: include/classes/validators/CApiInputValidator.php:682 -#: include/classes/validators/CApiInputValidator.php:727 -#: include/classes/validators/CApiInputValidator.php:756 -#: include/classes/validators/CApiInputValidator.php:761 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:803 -#: include/classes/validators/CApiInputValidator.php:846 -#: include/classes/validators/CApiInputValidator.php:855 -#: include/classes/validators/CApiInputValidator.php:861 -#: include/classes/validators/CApiInputValidator.php:889 -#: include/classes/validators/CApiInputValidator.php:899 -#: include/classes/validators/CApiInputValidator.php:905 -#: include/classes/validators/CApiInputValidator.php:941 -#: include/classes/validators/CApiInputValidator.php:952 -#: include/classes/validators/CApiInputValidator.php:959 -#: include/classes/validators/CApiInputValidator.php:986 -#: include/classes/validators/CApiInputValidator.php:996 -#: include/classes/validators/CApiInputValidator.php:1021 -#: include/classes/validators/CApiInputValidator.php:1026 -#: include/classes/validators/CApiInputValidator.php:1052 +#: include/classes/validators/CApiInputValidator.php:234 +#: include/classes/validators/CApiInputValidator.php:239 +#: include/classes/validators/CApiInputValidator.php:244 +#: include/classes/validators/CApiInputValidator.php:274 +#: include/classes/validators/CApiInputValidator.php:335 +#: include/classes/validators/CApiInputValidator.php:342 +#: include/classes/validators/CApiInputValidator.php:374 +#: include/classes/validators/CApiInputValidator.php:379 +#: include/classes/validators/CApiInputValidator.php:421 +#: include/classes/validators/CApiInputValidator.php:426 +#: include/classes/validators/CApiInputValidator.php:479 +#: include/classes/validators/CApiInputValidator.php:512 +#: include/classes/validators/CApiInputValidator.php:517 +#: include/classes/validators/CApiInputValidator.php:558 +#: include/classes/validators/CApiInputValidator.php:563 +#: include/classes/validators/CApiInputValidator.php:568 +#: include/classes/validators/CApiInputValidator.php:597 +#: include/classes/validators/CApiInputValidator.php:652 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:686 +#: include/classes/validators/CApiInputValidator.php:731 +#: include/classes/validators/CApiInputValidator.php:760 +#: include/classes/validators/CApiInputValidator.php:765 +#: include/classes/validators/CApiInputValidator.php:802 +#: include/classes/validators/CApiInputValidator.php:807 +#: include/classes/validators/CApiInputValidator.php:850 +#: include/classes/validators/CApiInputValidator.php:859 +#: include/classes/validators/CApiInputValidator.php:865 +#: include/classes/validators/CApiInputValidator.php:893 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:909 +#: include/classes/validators/CApiInputValidator.php:945 +#: include/classes/validators/CApiInputValidator.php:956 +#: include/classes/validators/CApiInputValidator.php:963 +#: include/classes/validators/CApiInputValidator.php:990 +#: include/classes/validators/CApiInputValidator.php:1000 +#: include/classes/validators/CApiInputValidator.php:1025 +#: include/classes/validators/CApiInputValidator.php:1030 +#: include/classes/validators/CApiInputValidator.php:1054 #: include/classes/validators/CApiInputValidator.php:1059 -#: include/classes/validators/CApiInputValidator.php:1086 -#: include/classes/validators/CApiInputValidator.php:1093 -#: include/classes/validators/CApiInputValidator.php:1120 -#: include/classes/validators/CApiInputValidator.php:1129 -#: include/classes/validators/CApiInputValidator.php:1174 -#: include/classes/validators/CApiInputValidator.php:1185 +#: include/classes/validators/CApiInputValidator.php:1085 +#: include/classes/validators/CApiInputValidator.php:1092 +#: include/classes/validators/CApiInputValidator.php:1119 +#: include/classes/validators/CApiInputValidator.php:1126 +#: include/classes/validators/CApiInputValidator.php:1153 +#: include/classes/validators/CApiInputValidator.php:1162 +#: include/classes/validators/CApiInputValidator.php:1207 #: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1273 -#: include/classes/validators/CApiInputValidator.php:1360 -#: include/classes/validators/CApiInputValidator.php:1365 -#: include/classes/validators/CApiInputValidator.php:1392 -#: include/classes/validators/CApiInputValidator.php:1397 +#: include/classes/validators/CApiInputValidator.php:1251 +#: include/classes/validators/CApiInputValidator.php:1306 +#: include/classes/validators/CApiInputValidator.php:1393 +#: include/classes/validators/CApiInputValidator.php:1398 +#: include/classes/validators/CApiInputValidator.php:1425 +#: include/classes/validators/CApiInputValidator.php:1430 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:133 #: include/classes/widgets/forms/CWidgetFormMap.php:101 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:479 @@ -9073,7 +9087,7 @@ msgstr "第二个参数无效." #: include/classes/import/validators/C32XmlValidator.php:1007 #: include/classes/import/validators/C34XmlValidator.php:1111 #: include/classes/import/validators/C40XmlValidator.php:1290 -#: include/classes/import/validators/C42XmlValidator.php:1298 +#: include/classes/import/validators/C42XmlValidator.php:1326 #: include/classes/import/validators/CXmlValidatorGeneral.php:90 #: include/classes/import/validators/CXmlValidatorGeneral.php:105 #: include/classes/import/validators/CXmlValidatorGeneral.php:124 @@ -9164,12 +9178,12 @@ msgstr "意大利语 (it_IT)" #: include/classes/screens/CScreenPlainText.php:42 #: include/classes/widgets/forms/CWidgetFormClock.php:48 #: include/classes/widgets/forms/CWidgetFormGraph.php:48 -#: include/forms.inc.php:1119 include/views/configuration.graph.edit.php:157 +#: include/forms.inc.php:1116 include/views/configuration.graph.edit.php:157 #: include/views/configuration.graph.edit.php:238 #: include/views/monitoring.screen.constructor.edit.php:258 #: include/views/monitoring.screen.constructor.edit.php:427 #: include/views/monitoring.screen.constructor.edit.php:773 items.php:991 -#: items.php:1381 +#: items.php:1382 msgid "Item" msgstr "监控项" @@ -9179,17 +9193,17 @@ msgid "Item \"%1$s\"" msgstr "监控项目\"%1$s\"" #: include/classes/api/services/CHostPrototype.php:973 -#: include/classes/api/services/CItem.php:35 +#: include/classes/api/services/CItem.php:50 #, c-format msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template." msgstr "键值为 \"%1$s\"的监控项已存在于 \"%2$s\", 继承自其他模板." -#: include/classes/api/services/CItem.php:36 +#: include/classes/api/services/CItem.php:51 #, c-format msgid "Item \"%1$s\" already exists on \"%2$s\"." msgstr "监控项\"%1$s\"已经存在于\"%2$s\"." -#: include/classes/api/services/CItem.php:954 +#: include/classes/api/services/CItem.php:904 #, c-format msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d." msgstr "监控项\"%1$s\"不能填入一个不存在的主机资产纪录栏位号码\"%2$d\". 选择为: 从0(不填入)到%3$d." @@ -9199,8 +9213,8 @@ msgstr "监控项\"%1$s\"不能填入一个不存在的主机资产纪录栏位 msgid "Item \"%1$s\" does not exist on template \"%2$s\"." msgstr "监控项\"%1$s\"不存在于模板\"%2$s\"中." -#: include/classes/api/services/CDiscoveryRule.php:1360 -#: include/classes/api/services/CItemGeneral.php:1689 +#: include/classes/api/services/CDiscoveryRule.php:1666 +#: include/classes/api/services/CItemGeneral.php:1811 #, c-format msgid "Item \"%1$s\" does not exist or you have no access to this item" msgstr "项目 \"%1$s\" 不存在或您无权访问此项目" @@ -9224,7 +9238,7 @@ msgstr "监控项\"%1$s:%2$s\"有无效的端口: \"%3$s\"." msgid "Item added" msgstr "监控项已添加" -#: items.php:1349 +#: items.php:1350 msgid "Item copied" msgid_plural "Items copied" msgstr[0] "监控项复制" @@ -9237,12 +9251,12 @@ msgstr "监控项数量" msgid "Item deleted" msgstr "监控项已删除" -#: applications.php:172 items.php:1307 +#: applications.php:172 items.php:1308 msgid "Item disabled" msgid_plural "Items disabled" msgstr[0] "监控项目被禁用" -#: applications.php:171 items.php:1306 +#: applications.php:171 items.php:1307 msgid "Item enabled" msgid_plural "Items enabled" msgstr[0] "监控项目已启用" @@ -9255,31 +9269,27 @@ msgstr "监控项在“不支持”的状态" msgid "Item not selected" msgstr "项目未被选择" -#: include/classes/api/services/CItemGeneral.php:1191 +#: include/classes/api/services/CItemGeneral.php:1281 #, c-format msgid "Item pre-processing is missing parameters: %1$s" msgstr "项目预处理缺少参数：%1$s" -#: include/classes/api/services/CDiscoveryRule.php:1140 -msgid "Item pre-processing is not allowed for discovery rules." -msgstr "发现规则不允许进行项目预处理。" - -#: include/audit.inc.php:39 include/forms.inc.php:1119 +#: include/audit.inc.php:39 include/forms.inc.php:1116 #: include/views/monitoring.screen.constructor.edit.php:351 msgid "Item prototype" msgstr "监控项原型" -#: include/classes/api/services/CItemPrototype.php:35 +#: include/classes/api/services/CItemPrototype.php:50 #, c-format msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template." msgstr "监控项原型\"%1$s\"已经存在于\"%2$s\",继承自其它的模板." -#: include/classes/api/services/CItemGeneral.php:1006 +#: include/classes/api/services/CItemGeneral.php:1041 #, c-format msgid "Item prototype \"%1$s\" already exists on \"%2$s\", linked to another rule." msgstr "" -#: include/classes/api/services/CItemPrototype.php:36 +#: include/classes/api/services/CItemPrototype.php:51 #, c-format msgid "Item prototype \"%1$s\" already exists on \"%2$s\"." msgstr "\"%2$s\"上的项目模板\"%1$s\"已经存在." @@ -9316,7 +9326,7 @@ msgstr "监控项原型" msgid "Item prototypes deleted" msgstr "项目模板已删除" -#: disc_prototypes.php:1103 +#: disc_prototypes.php:1116 msgid "Item prototypes updated" msgstr "" @@ -9353,32 +9363,32 @@ msgstr "" msgid "Item with ID \"%1$s\" is not available." msgstr "ID为 \"%1$s\" 的项目不可用。" -#: include/classes/api/services/CItemGeneral.php:721 +#: include/classes/api/services/CItemGeneral.php:670 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule." msgstr "键值为 \"%1$s\"的监控项已存在于\"%2$s\" 为探索规则." -#: include/classes/api/services/CItemGeneral.php:727 +#: include/classes/api/services/CItemGeneral.php:676 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype." msgstr "键值为 \"%1$s\"的监控项已存在于\"%2$s\" 为创建自监控项原型的项目." -#: include/classes/api/services/CItemGeneral.php:724 +#: include/classes/api/services/CItemGeneral.php:673 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype." msgstr "键值为 \"%1$s\"的监控项已存在于\"%2$s\" 为监控项原型." -#: include/classes/api/services/CItemGeneral.php:718 +#: include/classes/api/services/CItemGeneral.php:667 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item." msgstr "键值为 \"%1$s\"的监控项已存在于\"%2$s\" 为监控项." -#: include/classes/api/services/CItemGeneral.php:730 +#: include/classes/api/services/CItemGeneral.php:679 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element." msgstr "键值为 \"%1$s\"的监控项已存在于\"%2$s\" 为未知的监控项组件." -#: include/classes/api/services/CItemGeneral.php:1581 +#: include/classes/api/services/CItemGeneral.php:1671 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\"." msgstr "键值为 \"%1$s\"的监控项已存在于\"%2$s\" ." @@ -9402,11 +9412,11 @@ msgstr "键值为 \"%1$s\"的监控项已存在于\"%2$s\" ." #: include/views/configuration.template.list.php:87 #: include/views/configuration.template.list.php:188 #: include/views/conf.import.php:34 include/views/inventory.host.view.php:151 -#: include/views/inventory.host.view.php:162 items.php:1701 queue.php:109 +#: include/views/inventory.host.view.php:162 items.php:1712 queue.php:109 msgid "Items" msgstr "监控项" -#: items.php:1404 +#: items.php:1405 msgid "Items deleted" msgstr "监控项已删除" @@ -9418,7 +9428,7 @@ msgstr "监控项列表" msgid "Items location" msgstr "" -#: items.php:1286 +#: items.php:1287 msgid "Items updated" msgstr "监控项已更新" @@ -9430,10 +9440,10 @@ msgstr "JMX" msgid "JMX agent" msgstr "JMX agent代理程序" -#: include/views/configuration.host.discovery.edit.php:465 -#: include/views/configuration.item.edit.php:612 +#: include/views/configuration.host.discovery.edit.php:454 +#: include/views/configuration.item.edit.php:599 #: include/views/configuration.item.massupdate.php:97 -#: include/views/configuration.item.prototype.edit.php:544 +#: include/views/configuration.item.prototype.edit.php:531 #: include/views/configuration.item.prototype.massupdate.php:93 msgid "JMX endpoint" msgstr "JMX endpoint" @@ -9445,14 +9455,10 @@ msgstr "JMX endpoint" msgid "JMX interfaces" msgstr "JMX接口" -#: include/items.inc.php:1738 -msgid "JSON Path" -msgstr "JSON 路径" - -#: include/views/configuration.host.discovery.edit.php:172 -#: include/views/configuration.item.edit.php:204 -#: include/views/configuration.item.massupdate.php:119 -#: include/views/configuration.item.prototype.edit.php:192 +#: include/views/configuration.host.discovery.edit.php:168 +#: include/views/configuration.item.edit.php:203 +#: include/views/configuration.item.massupdate.php:117 +#: include/views/configuration.item.prototype.edit.php:188 #: include/views/configuration.item.prototype.massupdate.php:113 msgid "JSON data" msgstr "" @@ -9478,6 +9484,11 @@ msgstr "JSON-rpc 参数不是一个数组." msgid "JSON-rpc version is not specified." msgstr "JSON-rpc 版本并未定义." +#: include/items.inc.php:1733 +#: include/views/configuration.host.discovery.edit.php:681 +msgid "JSONPath" +msgstr "" + #: app/views/administration.mediatype.edit.php:53 include/media.inc.php:27 msgid "Jabber" msgstr "Jabber" @@ -9491,7 +9502,7 @@ msgstr "Jabber 标识符" msgid "Jan" msgstr "一月" -#: include/forms.inc.php:1956 include/func.inc.php:116 +#: include/forms.inc.php:2204 include/func.inc.php:116 #: include/func.inc.php:253 jsLoader.php:133 msgid "January" msgstr "一月" @@ -9504,7 +9515,7 @@ msgstr "日语 (ja_JP)" msgid "Jul" msgstr "七月" -#: include/forms.inc.php:1959 include/func.inc.php:122 +#: include/forms.inc.php:2207 include/func.inc.php:122 #: include/func.inc.php:259 jsLoader.php:139 msgid "July" msgstr "七月" @@ -9513,12 +9524,12 @@ msgstr "七月" msgid "Jun" msgstr "六月" -#: include/forms.inc.php:1996 include/func.inc.php:121 +#: include/forms.inc.php:2244 include/func.inc.php:121 #: include/func.inc.php:258 jsLoader.php:138 msgid "June" msgstr "六月" -#: include/views/configuration.host.discovery.edit.php:565 +#: include/views/configuration.host.discovery.edit.php:554 msgid "Keep lost resources period" msgstr "资源周期不足" @@ -9526,11 +9537,11 @@ msgstr "资源周期不足" #: app/controllers/CControllerPopupGeneric.php:222 #: app/controllers/CControllerPopupGeneric.php:274 disc_prototypes.php:46 #: host_discovery.php:50 include/forms.inc.php:469 -#: include/views/configuration.host.discovery.edit.php:68 +#: include/views/configuration.host.discovery.edit.php:67 #: include/views/configuration.host.discovery.list.php:56 -#: include/views/configuration.item.edit.php:104 +#: include/views/configuration.item.edit.php:106 #: include/views/configuration.item.list.php:65 -#: include/views/configuration.item.prototype.edit.php:93 +#: include/views/configuration.item.prototype.edit.php:92 #: include/views/configuration.item.prototype.list.php:53 #: include/views/js/configuration.discovery.edit.js.php:56 items.php:47 msgid "Key" @@ -9544,7 +9555,7 @@ msgstr "键值\"%1$s\"不符 <grpmax|grpmin|grpsum|grpavg>[\"Host group(s)\", \" #: include/views/configuration.action.edit.php:987 #: include/views/configuration.action.edit.php:1774 #: include/views/configuration.action.edit.php:2229 -#: include/views/js/common.item.edit.js.php:518 +#: include/views/js/common.item.edit.js.php:248 msgid "Key passphrase" msgstr "键值通行短语" @@ -9570,7 +9581,7 @@ msgstr "LDAP" msgid "LDAP authentication" msgstr "LDAP认证" -#: app/views/administration.authentication.edit.php:83 +#: app/views/administration.authentication.edit.php:86 msgid "LDAP host" msgstr "LDAP主机" @@ -9578,18 +9589,27 @@ msgstr "LDAP主机" msgid "LDAP is not configured" msgstr "" -#: app/controllers/CControllerAuthenticationUpdate.php:180 +#: app/controllers/CControllerAuthenticationUpdate.php:182 msgid "LDAP login successful" msgstr "LDAP登录成功" -#: app/views/administration.authentication.edit.php:137 +#: app/views/administration.authentication.edit.php:147 msgid "LDAP settings" msgstr "" +#: include/views/configuration.host.discovery.edit.php:681 +msgid "LLD macro" +msgstr "" + +#: include/views/configuration.host.discovery.edit.php:733 +#: include/views/configuration.host.discovery.edit.php:748 +msgid "LLD macros" +msgstr "" + #: include/maps.inc.php:45 include/views/configuration.action.edit.php:51 #: include/views/configuration.action.edit.php:1100 #: include/views/configuration.correlation.edit.php:48 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/views/configuration.host.discovery.edit.php:605 #: include/views/js/monitoring.sysmaps.js.php:111 #: include/views/js/monitoring.sysmaps.js.php:582 #: include/views/js/monitoring.sysmaps.js.php:690 @@ -9744,7 +9764,7 @@ msgstr "左侧" msgid "Left Y" msgstr "" -#: include/items.inc.php:1731 +#: include/items.inc.php:1725 msgid "Left trim" msgstr "修整左边" @@ -9914,9 +9934,9 @@ msgid "Location longitude" msgstr "位置经度" #: include/forms.inc.php:354 include/items.inc.php:133 -#: include/views/configuration.item.edit.php:679 -#: include/views/configuration.item.massupdate.php:280 -#: include/views/configuration.item.prototype.edit.php:608 +#: include/views/configuration.item.edit.php:666 +#: include/views/configuration.item.massupdate.php:268 +#: include/views/configuration.item.prototype.edit.php:595 #: include/views/configuration.item.prototype.massupdate.php:263 msgid "Log" msgstr "日志" @@ -9929,10 +9949,10 @@ msgstr "日志文件监控与轮转服务。返回日志" msgid "Log file monitoring. Returns log" msgstr "日志文件监控。返回日志" -#: include/views/configuration.item.edit.php:813 -#: include/views/configuration.item.massupdate.php:544 -#: include/views/configuration.item.prototype.edit.php:692 -#: include/views/configuration.item.prototype.massupdate.php:525 +#: include/views/configuration.item.edit.php:798 +#: include/views/configuration.item.massupdate.php:427 +#: include/views/configuration.item.prototype.edit.php:679 +#: include/views/configuration.item.prototype.massupdate.php:425 msgid "Log time format" msgstr "日志时间格式" @@ -9940,7 +9960,7 @@ msgstr "日志时间格式" msgid "Log unmatched SNMP traps" msgstr "日志与SNMP采集器不符" -#: app/views/administration.authentication.edit.php:115 auditlogs.php:138 +#: app/views/administration.authentication.edit.php:123 auditlogs.php:138 #: include/func.inc.php:1790 include/func.inc.php:1805 #: include/menu.inc.php:294 include/views/administration.auditlogs.list.php:44 #: include/views/administration.users.list.php:89 index_http.php:91 @@ -9995,11 +10015,11 @@ msgid "MD2" msgstr "MD2" #: include/hosts.inc.php:34 -#: include/views/configuration.host.discovery.edit.php:426 -#: include/views/configuration.item.edit.php:536 -#: include/views/configuration.item.edit.php:543 -#: include/views/configuration.item.massupdate.php:225 -#: include/views/configuration.item.prototype.edit.php:505 +#: include/views/configuration.host.discovery.edit.php:414 +#: include/views/configuration.item.edit.php:522 +#: include/views/configuration.item.edit.php:529 +#: include/views/configuration.item.massupdate.php:218 +#: include/views/configuration.item.prototype.edit.php:491 #: include/views/configuration.item.prototype.massupdate.php:214 #: include/views/js/configuration.discovery.edit.js.php:97 msgid "MD5" @@ -10012,7 +10032,7 @@ msgstr "文件的MD5校验。返回字符串（该文件的MD5哈希值）" #: include/audit.inc.php:52 #: include/views/administration.general.macros.edit.php:38 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/views/configuration.host.discovery.edit.php:605 #: include/views/hostmacros.php:46 include/views/hostmacros.php:50 msgid "Macro" msgstr "宏" @@ -10109,7 +10129,7 @@ msgstr "维护已删除" msgid "Maintenance period" msgstr "维护周期" -#: include/forms.inc.php:2112 +#: include/forms.inc.php:2360 msgid "Maintenance period length" msgstr "维护期间长度" @@ -10256,7 +10276,7 @@ msgstr "拓扑图" msgid "Mar" msgstr "三月" -#: include/forms.inc.php:1972 include/func.inc.php:118 +#: include/forms.inc.php:2220 include/func.inc.php:118 #: include/func.inc.php:255 jsLoader.php:135 msgid "March" msgstr "三月" @@ -10280,9 +10300,9 @@ msgstr "掩码" #: include/classes/screens/CScreenProblem.php:1095 #: include/views/configuration.host.list.php:360 #: include/views/configuration.item.list.php:291 -#: include/views/configuration.item.massupdate.php:691 +#: include/views/configuration.item.massupdate.php:575 #: include/views/configuration.item.prototype.list.php:176 -#: include/views/configuration.item.prototype.massupdate.php:686 +#: include/views/configuration.item.prototype.massupdate.php:586 #: include/views/configuration.trigger.prototype.list.php:164 #: include/views/configuration.trigger.prototype.massupdate.php:184 #: include/views/configuration.triggers.list.php:304 @@ -10298,14 +10318,14 @@ msgstr "批量更新组件" msgid "Mass update shapes" msgstr "批量更新形状" -#: disc_prototypes.php:51 include/views/configuration.item.edit.php:396 -#: include/views/configuration.item.massupdate.php:676 -#: include/views/configuration.item.prototype.edit.php:428 -#: include/views/configuration.item.prototype.massupdate.php:669 items.php:51 +#: disc_prototypes.php:51 include/views/configuration.item.edit.php:381 +#: include/views/configuration.item.massupdate.php:558 +#: include/views/configuration.item.prototype.edit.php:411 +#: include/views/configuration.item.prototype.massupdate.php:569 items.php:51 msgid "Master item" msgstr "主要项" -#: include/items.inc.php:1766 +#: include/items.inc.php:1765 msgid "Matches regular expression" msgstr "" @@ -10354,7 +10374,7 @@ msgstr[0] "将要显示的最大时间区间是%1$s天" msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" -#: include/forms.inc.php:1988 include/func.inc.php:120 +#: include/forms.inc.php:2236 include/func.inc.php:120 #: include/func.inc.php:257 jsLoader.php:137 msgid "May" msgstr "五月" @@ -10542,7 +10562,7 @@ msgid "Minimum time period to display is %1$s minute." msgid_plural "Minimum time period to display is %1$s minutes." msgstr[0] "可显示最短的时间为 %1$s 分。" -#: include/forms.inc.php:2120 +#: include/forms.inc.php:2368 msgid "Minutes" msgstr "分" @@ -10555,7 +10575,7 @@ msgstr "项目丢失\"gitemid\"字段" msgid "Missing \"itemid\" field for item." msgstr "缺少\"itemid\" 的监控项栏位" -#: include/classes/api/services/CItemPrototype.php:312 +#: include/classes/api/services/CItemPrototype.php:327 #, c-format msgid "Missing \"name\" field for application prototype in item prototype \"%1$s\"." msgstr "找不到应用项目原型 \"name\" 字段 \"%1$s\"。" @@ -10605,7 +10625,7 @@ msgstr "模型" msgid "Mon" msgstr "一" -#: include/forms.inc.php:1912 include/forms.inc.php:2027 +#: include/forms.inc.php:2160 include/forms.inc.php:2275 #: include/func.inc.php:135 include/func.inc.php:225 jsLoader.php:145 msgid "Monday" msgstr "周一" @@ -10632,11 +10652,11 @@ msgstr "监测中" msgid "Monospace" msgstr "等宽字体" -#: app/views/report.services.php:67 include/forms.inc.php:1952 report4.php:166 +#: app/views/report.services.php:67 include/forms.inc.php:2200 report4.php:166 msgid "Month" msgstr "月" -#: app/views/report.services.php:36 include/forms.inc.php:1877 +#: app/views/report.services.php:36 include/forms.inc.php:2125 #: include/maintenances.inc.php:37 report4.php:109 msgid "Monthly" msgstr "每月" @@ -10683,9 +10703,9 @@ msgid "NNTP" msgstr "NNTP" #: include/httptest.inc.php:29 -#: include/views/configuration.host.discovery.edit.php:286 -#: include/views/configuration.item.edit.php:327 -#: include/views/configuration.item.prototype.edit.php:315 +#: include/views/configuration.host.discovery.edit.php:277 +#: include/views/configuration.item.edit.php:320 +#: include/views/configuration.item.prototype.edit.php:305 msgid "NTLM" msgstr "NTLM" @@ -10729,7 +10749,7 @@ msgstr "NTLM" #: disc_prototypes.php:42 graphs.php:42 host_discovery.php:48 httpconf.php:42 #: include/classes/screens/CScreenHttpTest.php:116 #: include/classes/widgets/CWidgetHelper.php:51 include/forms.inc.php:450 -#: include/hosts.inc.php:109 +#: include/forms.inc.php:1396 include/hosts.inc.php:109 #: include/views/administration.general.iconmap.edit.php:43 #: include/views/administration.general.iconmap.list.php:37 #: include/views/administration.general.image.edit.php:42 @@ -10757,9 +10777,9 @@ msgstr "NTLM" #: include/views/configuration.graph.edit.php:78 #: include/views/configuration.graph.edit.php:330 #: include/views/configuration.graph.list.php:87 -#: include/views/configuration.host.discovery.edit.php:46 -#: include/views/configuration.host.discovery.edit.php:110 -#: include/views/configuration.host.discovery.edit.php:205 +#: include/views/configuration.host.discovery.edit.php:44 +#: include/views/configuration.host.discovery.edit.php:109 +#: include/views/configuration.host.discovery.edit.php:201 #: include/views/configuration.host.discovery.list.php:51 #: include/views/configuration.host.edit.php:546 #: include/views/configuration.host.edit.php:623 @@ -10775,20 +10795,16 @@ msgstr "NTLM" #: include/views/configuration.httpconf.edit.php:195 #: include/views/configuration.httpconf.list.php:88 #: include/views/configuration.item.edit.php:63 -#: include/views/configuration.item.edit.php:142 -#: include/views/configuration.item.edit.php:237 -#: include/views/configuration.item.edit.php:935 +#: include/views/configuration.item.edit.php:144 +#: include/views/configuration.item.edit.php:236 #: include/views/configuration.item.list.php:63 #: include/views/configuration.item.list.php:150 -#: include/views/configuration.item.massupdate.php:154 -#: include/views/configuration.item.massupdate.php:341 -#: include/views/configuration.item.prototype.edit.php:51 -#: include/views/configuration.item.prototype.edit.php:130 -#: include/views/configuration.item.prototype.edit.php:225 -#: include/views/configuration.item.prototype.edit.php:768 +#: include/views/configuration.item.massupdate.php:152 +#: include/views/configuration.item.prototype.edit.php:49 +#: include/views/configuration.item.prototype.edit.php:129 +#: include/views/configuration.item.prototype.edit.php:221 #: include/views/configuration.item.prototype.list.php:52 #: include/views/configuration.item.prototype.massupdate.php:148 -#: include/views/configuration.item.prototype.massupdate.php:318 #: include/views/configuration.maintenance.edit.php:40 #: include/views/configuration.maintenance.list.php:45 #: include/views/configuration.maintenance.list.php:70 @@ -10888,12 +10904,12 @@ msgid "New" msgstr "新的" #: include/views/configuration.httpconf.edit.php:75 -#: include/views/configuration.item.edit.php:876 -#: include/views/configuration.item.prototype.edit.php:725 +#: include/views/configuration.item.edit.php:861 +#: include/views/configuration.item.prototype.edit.php:714 msgid "New application" msgstr "新的应用集" -#: include/views/configuration.item.prototype.edit.php:739 +#: include/views/configuration.item.prototype.edit.php:728 msgid "New application prototype" msgstr "新的应用程序原型" @@ -11030,7 +11046,7 @@ msgstr "聚合图形的 \"%1$s\"未配置" msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"." msgstr "动作\"%1$s\"的过滤器条件未配置 \"%2$s\" " -#: include/classes/api/services/CDiscoveryRule.php:1117 +#: include/classes/api/services/CDiscoveryRule.php:1281 #, c-format msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"." msgstr "自动发现规则\"%1$s\"的过滤器条件的\"%2$s\"未配置" @@ -11040,7 +11056,7 @@ msgstr "自动发现规则\"%1$s\"的过滤器条件的\"%2$s\"未配置" msgid "No \"%2$s\" given for the filter of action \"%1$s\"." msgstr "动作 \"%1$s\"的过滤器未配置\"%2$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1085 +#: include/classes/api/services/CDiscoveryRule.php:1249 #, c-format msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"." msgstr "自动发现规则 \"%1$s\"的过滤器未配置\"%2$s\"." @@ -11143,7 +11159,7 @@ msgstr "在\"%2$s\"上的\"%1$s\"类型无默认接口." msgid "No details" msgstr "没有细节" -#: include/classes/api/services/CDiscoveryRule.php:603 +#: include/classes/api/services/CDiscoveryRule.php:618 msgid "No discovery rule IDs given." msgstr "没有所称的自动发现规则ID" @@ -11184,7 +11200,7 @@ msgstr "没有图表元素指定的数据图模板ID." msgid "No graphs added." msgstr "未添加数据图." -#: include/classes/api/services/CDiscoveryRule.php:606 +#: include/classes/api/services/CDiscoveryRule.php:621 msgid "No host IDs given." msgstr "没有所知的主机IDs" @@ -11221,10 +11237,10 @@ msgstr "没有对应组件\"%s\"的图标." msgid "No image" msgstr "没有图片" -#: include/views/configuration.host.discovery.edit.php:382 -#: include/views/configuration.item.edit.php:474 -#: include/views/configuration.item.massupdate.php:78 -#: include/views/configuration.item.prototype.edit.php:461 +#: include/views/configuration.host.discovery.edit.php:368 +#: include/views/configuration.item.edit.php:459 +#: include/views/configuration.item.massupdate.php:77 +#: include/views/configuration.item.prototype.edit.php:444 #: include/views/configuration.item.prototype.massupdate.php:74 #: jsLoader.php:269 msgid "No interface found" @@ -11240,8 +11256,8 @@ msgstr "没有找到接口." msgid "No interface provided for proxy \"%s\"." msgstr "代理\"%s\" 没有提供接口." -#: include/classes/api/services/CHost.php:1690 -#: include/classes/api/services/CHost.php:1866 +#: include/classes/api/services/CHost.php:1726 +#: include/classes/api/services/CHost.php:1902 #, c-format msgid "No interfaces for host \"%s\"." msgstr "主机\"%s\" 没有提供接口." @@ -11304,8 +11320,8 @@ msgstr "没有系统访问权限。" #: app/controllers/CControllerWidgetDiscoveryView.php:64 #: app/controllers/CControllerWidgetMapView.php:68 #: app/controllers/CControllerWidgetPlainTextView.php:78 -#: app/views/monitoring.widget.graph.view.php:23 disc_prototypes.php:1171 -#: disc_prototypes.php:1385 include/classes/api/services/CAction.php:1541 +#: app/views/monitoring.widget.graph.view.php:23 disc_prototypes.php:1184 +#: disc_prototypes.php:1408 include/classes/api/services/CAction.php:1541 #: include/classes/api/services/CAction.php:1890 #: include/classes/api/services/CAction.php:2878 #: include/classes/api/services/CApplication.php:304 @@ -11320,9 +11336,10 @@ msgstr "没有系统访问权限。" #: include/classes/api/services/CDashboard.php:368 #: include/classes/api/services/CDashboard.php:393 #: include/classes/api/services/CDashboard.php:1233 -#: include/classes/api/services/CDiscoveryRule.php:481 -#: include/classes/api/services/CDiscoveryRule.php:582 -#: include/classes/api/services/CDiscoveryRule.php:618 +#: include/classes/api/services/CDiscoveryRule.php:496 +#: include/classes/api/services/CDiscoveryRule.php:597 +#: include/classes/api/services/CDiscoveryRule.php:633 +#: include/classes/api/services/CDiscoveryRule.php:1474 #: include/classes/api/services/CDRule.php:183 #: include/classes/api/services/CDRule.php:309 #: include/classes/api/services/CDRule.php:336 @@ -11339,21 +11356,21 @@ msgstr "没有系统访问权限。" #: include/classes/api/services/CGraphPrototype.php:717 #: include/classes/api/services/CHostBase.php:49 #: include/classes/api/services/CHostGeneral.php:56 -#: include/classes/api/services/CHostGroup.php:532 -#: include/classes/api/services/CHostGroup.php:788 -#: include/classes/api/services/CHostGroup.php:1027 -#: include/classes/api/services/CHostGroup.php:1058 -#: include/classes/api/services/CHostGroup.php:1159 -#: include/classes/api/services/CHostGroup.php:1281 -#: include/classes/api/services/CHostGroup.php:1301 +#: include/classes/api/services/CHostGroup.php:696 +#: include/classes/api/services/CHostGroup.php:805 +#: include/classes/api/services/CHostGroup.php:1044 +#: include/classes/api/services/CHostGroup.php:1075 +#: include/classes/api/services/CHostGroup.php:1176 +#: include/classes/api/services/CHostGroup.php:1298 +#: include/classes/api/services/CHostGroup.php:1318 #: include/classes/api/services/CHostInterface.php:239 #: include/classes/api/services/CHostInterface.php:259 #: include/classes/api/services/CHostInterface.php:394 #: include/classes/api/services/CHostInterface.php:653 #: include/classes/api/services/CHost.php:1122 #: include/classes/api/services/CHost.php:1157 -#: include/classes/api/services/CHost.php:1666 -#: include/classes/api/services/CHost.php:1798 +#: include/classes/api/services/CHost.php:1702 +#: include/classes/api/services/CHost.php:1834 #: include/classes/api/services/CHostPrototype.php:353 #: include/classes/api/services/CHostPrototype.php:399 #: include/classes/api/services/CHostPrototype.php:420 @@ -11373,8 +11390,8 @@ msgstr "没有系统访问权限。" #: include/classes/api/services/CItemGeneral.php:209 #: include/classes/api/services/CItemGeneral.php:311 #: include/classes/api/services/CItemGeneral.php:326 -#: include/classes/api/services/CItem.php:699 -#: include/classes/api/services/CItemPrototype.php:869 +#: include/classes/api/services/CItem.php:712 +#: include/classes/api/services/CItemPrototype.php:883 #: include/classes/api/services/CMaintenance.php:263 #: include/classes/api/services/CMaintenance.php:292 #: include/classes/api/services/CMaintenance.php:305 @@ -11433,7 +11450,7 @@ msgstr "没有系统访问权限。" #: include/classes/helpers/CMapHelper.php:83 #: include/classes/screens/CScreenHistory.php:139 #: include/classes/screens/CScreenHttpTestDetails.php:46 -#: include/func.inc.php:1758 items.php:1489 items.php:1673 +#: include/func.inc.php:1758 items.php:1490 items.php:1684 msgid "No permissions to referred object or it does not exist!" msgstr "没有权限退回物件的或其不存在!" @@ -11483,7 +11500,7 @@ msgstr "没有指定给动作操作命令的脚本。" msgid "No target selected" msgstr "没有选择目标" -#: graphs.php:372 items.php:1354 +#: graphs.php:372 items.php:1355 msgid "No target selected." msgstr "没有已选的目标" @@ -11496,7 +11513,7 @@ msgstr "没有含触发器ID\"%1$s\"的触发器." msgid "No triggers defined." msgstr "没有已定义的触发器." -#: include/classes/validators/CApiInputValidator.php:618 +#: include/classes/validators/CApiInputValidator.php:622 msgid "Non-boolean flags are deprecated." msgstr "不推荐使用非布尔标志。" @@ -11517,17 +11534,17 @@ msgstr "不推荐使用非布尔标志。" #: include/views/administration.general.other.edit.php:42 #: include/views/administration.usergroups.edit.php:126 #: include/views/administration.usergroups.edit.php:158 -#: include/views/configuration.host.discovery.edit.php:284 +#: include/views/configuration.host.discovery.edit.php:275 #: include/views/configuration.host.list.php:275 #: include/views/configuration.host.list.php:281 #: include/views/configuration.host.list.php:293 #: include/views/configuration.host.list.php:296 -#: include/views/configuration.item.edit.php:325 -#: include/views/configuration.item.edit.php:881 -#: include/views/configuration.item.edit.php:895 -#: include/views/configuration.item.prototype.edit.php:313 -#: include/views/configuration.item.prototype.edit.php:732 -#: include/views/configuration.item.prototype.edit.php:747 +#: include/views/configuration.item.edit.php:318 +#: include/views/configuration.item.edit.php:866 +#: include/views/configuration.item.edit.php:880 +#: include/views/configuration.item.prototype.edit.php:303 +#: include/views/configuration.item.prototype.edit.php:721 +#: include/views/configuration.item.prototype.edit.php:736 #: include/views/configuration.trigger.prototype.edit.php:274 #: include/views/configuration.triggers.edit.php:298 #: include/views/js/monitoring.sysmaps.js.php:3 @@ -11621,7 +11638,7 @@ msgstr "" msgid "Nov" msgstr "十一" -#: include/forms.inc.php:1991 include/func.inc.php:126 +#: include/forms.inc.php:2239 include/func.inc.php:126 #: include/func.inc.php:263 jsLoader.php:143 msgid "November" msgstr "十一月" @@ -11763,14 +11780,15 @@ msgstr "VMware hypervisor管理的虚拟机数量，<url>-VMware服务URL，<uui msgid "Number or percentage of inodes. Returns integer for number; float for percentage" msgstr "数或inode的百分比。返回数字，如果是浮点则是百分比" -#: include/items.inc.php:1755 +#: include/items.inc.php:1748 include/items.inc.php:1752 +#: include/items.inc.php:1756 msgid "Numeral systems" msgstr "数字系统" #: include/forms.inc.php:352 include/items.inc.php:129 -#: include/triggers.inc.php:1862 include/views/configuration.item.edit.php:677 -#: include/views/configuration.item.massupdate.php:278 -#: include/views/configuration.item.prototype.edit.php:606 +#: include/triggers.inc.php:1862 include/views/configuration.item.edit.php:664 +#: include/views/configuration.item.massupdate.php:266 +#: include/views/configuration.item.prototype.edit.php:593 #: include/views/configuration.item.prototype.massupdate.php:261 msgid "Numeric (float)" msgstr "浮点数" @@ -11780,9 +11798,9 @@ msgid "Numeric (integer)" msgstr "" #: include/forms.inc.php:351 include/items.inc.php:127 -#: include/views/configuration.item.edit.php:676 -#: include/views/configuration.item.massupdate.php:277 -#: include/views/configuration.item.prototype.edit.php:605 +#: include/views/configuration.item.edit.php:663 +#: include/views/configuration.item.massupdate.php:265 +#: include/views/configuration.item.prototype.edit.php:592 #: include/views/configuration.item.prototype.massupdate.php:260 msgid "Numeric (unsigned)" msgstr "数字 (无正负)" @@ -11844,11 +11862,11 @@ msgstr "操作系统( 简短)" msgid "Oct" msgstr "十月" -#: include/items.inc.php:1758 +#: include/items.inc.php:1753 msgid "Octal to decimal" msgstr "八进制转十进制" -#: include/forms.inc.php:1983 include/func.inc.php:125 +#: include/forms.inc.php:2231 include/func.inc.php:125 #: include/func.inc.php:262 jsLoader.php:142 msgid "October" msgstr "十月" @@ -11865,7 +11883,7 @@ msgstr "关" #: include/classes/html/CTriggersInfo.php:76 #: include/views/administration.users.list.php:124 #: include/views/configuration.triggers.list.php:58 -#: include/views/js/common.item.edit.js.php:736 +#: include/views/js/common.item.edit.js.php:327 #: include/views/js/configuration.httpconf.edit.js.php:584 #: include/views/js/configuration.httpconf.edit.js.php:658 #: include/views/js/conf.import.js.php:24 report2.php:431 @@ -11900,11 +11918,11 @@ msgstr "一次" msgid "One" msgstr "壹" -#: include/classes/api/services/CHostGroup.php:1169 +#: include/classes/api/services/CHostGroup.php:1186 msgid "One of the objects is left without a host group." msgstr "其中的一个对象被留下没有主机组." -#: include/forms.inc.php:1874 include/maintenances.inc.php:31 +#: include/forms.inc.php:2122 include/maintenances.inc.php:31 msgid "One time only" msgstr "一次性" @@ -11913,7 +11931,7 @@ msgstr "一次性" msgid "One-time downtime" msgstr "单次停机" -#: include/classes/api/services/CHostGroup.php:743 +#: include/classes/api/services/CHostGroup.php:655 msgid "Only Super Admins can create host groups." msgstr "只有超级管理员可以创建主机群组." @@ -11963,7 +11981,7 @@ msgstr "只允许管理员设置幻灯片的所有者。" msgid "Only items assigned to enabled hosts are counted" msgstr "只计算指派给启用的主机的监控项" -#: include/classes/api/services/CItemGeneral.php:1369 +#: include/classes/api/services/CItemGeneral.php:1459 msgid "Only one change step is allowed." msgstr "只允许一次更改步骤。" @@ -11971,8 +11989,8 @@ msgstr "只允许一次更改步骤。" msgid "Only one check can be unique." msgstr "只有一个检查可为唯一." -#: include/classes/api/services/CItemGeneral.php:1346 -#: include/classes/api/services/CItemGeneral.php:1391 +#: include/classes/api/services/CItemGeneral.php:1436 +#: include/classes/api/services/CItemGeneral.php:1481 msgid "Only one throttling step is allowed." msgstr "" @@ -12085,7 +12103,7 @@ msgstr "选项" #: include/views/configuration.action.edit.php:113 #: include/views/configuration.action.edit.php:1151 #: include/views/configuration.correlation.edit.php:95 -#: include/views/configuration.host.discovery.edit.php:599 +#: include/views/configuration.host.discovery.edit.php:587 #: include/views/configuration.maintenance.edit.php:171 #: include/views/configuration.trigger.prototype.edit.php:137 #: include/views/configuration.trigger.prototype.edit.php:329 @@ -12109,41 +12127,41 @@ msgstr "或" #: include/views/configuration.host.massupdate.php:268 #: include/views/configuration.host.massupdate.php:309 #: include/views/configuration.host.massupdate.php:348 -#: include/views/configuration.item.massupdate.php:41 -#: include/views/configuration.item.massupdate.php:84 +#: include/views/configuration.item.massupdate.php:40 +#: include/views/configuration.item.massupdate.php:83 #: include/views/configuration.item.massupdate.php:96 -#: include/views/configuration.item.massupdate.php:104 -#: include/views/configuration.item.massupdate.php:113 -#: include/views/configuration.item.massupdate.php:127 -#: include/views/configuration.item.massupdate.php:148 -#: include/views/configuration.item.massupdate.php:184 -#: include/views/configuration.item.massupdate.php:192 -#: include/views/configuration.item.massupdate.php:200 -#: include/views/configuration.item.massupdate.php:208 -#: include/views/configuration.item.massupdate.php:220 +#: include/views/configuration.item.massupdate.php:103 +#: include/views/configuration.item.massupdate.php:111 +#: include/views/configuration.item.massupdate.php:124 +#: include/views/configuration.item.massupdate.php:146 +#: include/views/configuration.item.massupdate.php:181 +#: include/views/configuration.item.massupdate.php:188 +#: include/views/configuration.item.massupdate.php:195 +#: include/views/configuration.item.massupdate.php:202 +#: include/views/configuration.item.massupdate.php:213 +#: include/views/configuration.item.massupdate.php:225 #: include/views/configuration.item.massupdate.php:233 -#: include/views/configuration.item.massupdate.php:242 -#: include/views/configuration.item.massupdate.php:256 -#: include/views/configuration.item.massupdate.php:265 -#: include/views/configuration.item.massupdate.php:273 -#: include/views/configuration.item.massupdate.php:287 -#: include/views/configuration.item.massupdate.php:295 -#: include/views/configuration.item.massupdate.php:306 -#: include/views/configuration.item.massupdate.php:314 -#: include/views/configuration.item.massupdate.php:322 -#: include/views/configuration.item.massupdate.php:330 -#: include/views/configuration.item.massupdate.php:437 -#: include/views/configuration.item.massupdate.php:509 +#: include/views/configuration.item.massupdate.php:246 +#: include/views/configuration.item.massupdate.php:254 +#: include/views/configuration.item.massupdate.php:261 +#: include/views/configuration.item.massupdate.php:274 +#: include/views/configuration.item.massupdate.php:281 +#: include/views/configuration.item.massupdate.php:291 +#: include/views/configuration.item.massupdate.php:298 +#: include/views/configuration.item.massupdate.php:305 +#: include/views/configuration.item.massupdate.php:312 +#: include/views/configuration.item.massupdate.php:319 +#: include/views/configuration.item.massupdate.php:392 +#: include/views/configuration.item.massupdate.php:399 +#: include/views/configuration.item.massupdate.php:406 +#: include/views/configuration.item.massupdate.php:419 +#: include/views/configuration.item.massupdate.php:426 +#: include/views/configuration.item.massupdate.php:441 +#: include/views/configuration.item.massupdate.php:449 +#: include/views/configuration.item.massupdate.php:456 #: include/views/configuration.item.massupdate.php:517 -#: include/views/configuration.item.massupdate.php:523 -#: include/views/configuration.item.massupdate.php:535 -#: include/views/configuration.item.massupdate.php:543 -#: include/views/configuration.item.massupdate.php:560 -#: include/views/configuration.item.massupdate.php:567 -#: include/views/configuration.item.massupdate.php:574 -#: include/views/configuration.item.massupdate.php:635 -#: include/views/configuration.item.massupdate.php:675 -#: include/views/configuration.item.massupdate.php:684 +#: include/views/configuration.item.massupdate.php:557 +#: include/views/configuration.item.massupdate.php:566 #: include/views/configuration.item.prototype.massupdate.php:36 #: include/views/configuration.item.prototype.massupdate.php:79 #: include/views/configuration.item.prototype.massupdate.php:92 @@ -12167,19 +12185,19 @@ msgstr "或" #: include/views/configuration.item.prototype.massupdate.php:293 #: include/views/configuration.item.prototype.massupdate.php:300 #: include/views/configuration.item.prototype.massupdate.php:307 -#: include/views/configuration.item.prototype.massupdate.php:414 -#: include/views/configuration.item.prototype.massupdate.php:488 -#: include/views/configuration.item.prototype.massupdate.php:495 -#: include/views/configuration.item.prototype.massupdate.php:502 -#: include/views/configuration.item.prototype.massupdate.php:517 -#: include/views/configuration.item.prototype.massupdate.php:524 -#: include/views/configuration.item.prototype.massupdate.php:540 -#: include/views/configuration.item.prototype.massupdate.php:548 -#: include/views/configuration.item.prototype.massupdate.php:555 -#: include/views/configuration.item.prototype.massupdate.php:561 -#: include/views/configuration.item.prototype.massupdate.php:636 -#: include/views/configuration.item.prototype.massupdate.php:668 -#: include/views/configuration.item.prototype.massupdate.php:678 +#: include/views/configuration.item.prototype.massupdate.php:314 +#: include/views/configuration.item.prototype.massupdate.php:388 +#: include/views/configuration.item.prototype.massupdate.php:395 +#: include/views/configuration.item.prototype.massupdate.php:402 +#: include/views/configuration.item.prototype.massupdate.php:417 +#: include/views/configuration.item.prototype.massupdate.php:424 +#: include/views/configuration.item.prototype.massupdate.php:440 +#: include/views/configuration.item.prototype.massupdate.php:448 +#: include/views/configuration.item.prototype.massupdate.php:455 +#: include/views/configuration.item.prototype.massupdate.php:461 +#: include/views/configuration.item.prototype.massupdate.php:536 +#: include/views/configuration.item.prototype.massupdate.php:568 +#: include/views/configuration.item.prototype.massupdate.php:578 #: include/views/configuration.trigger.prototype.massupdate.php:41 #: include/views/configuration.trigger.prototype.massupdate.php:131 #: include/views/configuration.trigger.prototype.massupdate.php:163 @@ -12213,8 +12231,8 @@ msgstr "其它" msgid "Outgoing traffic statistics on network interface. Returns integer" msgstr "上行流量统计。返回整数" -#: include/views/configuration.item.edit.php:769 -#: include/views/configuration.item.edit.php:795 +#: include/views/configuration.item.edit.php:756 +#: include/views/configuration.item.edit.php:782 msgctxt "item_form" msgid "Overridden by" msgstr "覆盖被" @@ -12463,20 +12481,16 @@ msgstr "页面接收到错误的数据" msgid "Parameter" msgstr "参数" -#: include/classes/validators/CApiInputValidator.php:678 +#: include/classes/validators/CApiInputValidator.php:682 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "参数 \"%1$s\" 已被弃用。" -#: include/classes/debug/CProfiler.php:182 -#: include/views/configuration.item.edit.php:936 -#: include/views/configuration.item.massupdate.php:342 -#: include/views/configuration.item.prototype.edit.php:769 -#: include/views/configuration.item.prototype.massupdate.php:319 +#: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1397 msgid "Parameters" msgstr "参数" -#: include/views/configuration.host.discovery.edit.php:42 +#: include/views/configuration.host.discovery.edit.php:40 #: include/views/configuration.host.prototype.edit.php:52 msgid "Parent discovery rules" msgstr "上层探索规则" @@ -12486,7 +12500,7 @@ msgid "Parent graphs" msgstr "父图表" #: include/views/configuration.item.edit.php:44 -#: include/views/configuration.item.prototype.edit.php:42 +#: include/views/configuration.item.prototype.edit.php:40 msgid "Parent items" msgstr "上层监控项" @@ -12504,9 +12518,9 @@ msgid "Parent web scenarios" msgstr "上层 web 场景" #: app/views/popup.httpstep.php:56 -#: include/views/configuration.host.discovery.edit.php:82 -#: include/views/configuration.item.edit.php:114 -#: include/views/configuration.item.prototype.edit.php:103 +#: include/views/configuration.host.discovery.edit.php:80 +#: include/views/configuration.item.edit.php:115 +#: include/views/configuration.item.prototype.edit.php:101 msgid "Parse" msgstr "分析" @@ -12526,7 +12540,7 @@ msgid "Passive" msgstr "被动式" #: app/views/administration.mediatype.edit.php:164 disc_prototypes.php:266 -#: host_discovery.php:207 httpconf.php:58 +#: host_discovery.php:208 httpconf.php:58 #: include/classes/setup/CSetupWizard.php:248 #: include/views/administration.users.edit.php:109 #: include/views/administration.users.edit.php:140 @@ -12536,24 +12550,24 @@ msgstr "被动式" #: include/views/configuration.action.edit.php:1762 #: include/views/configuration.action.edit.php:2197 #: include/views/configuration.action.edit.php:2224 -#: include/views/configuration.host.discovery.edit.php:303 -#: include/views/configuration.host.discovery.edit.php:461 -#: include/views/configuration.host.discovery.edit.php:489 +#: include/views/configuration.host.discovery.edit.php:292 +#: include/views/configuration.host.discovery.edit.php:449 +#: include/views/configuration.host.discovery.edit.php:478 #: include/views/configuration.host.edit.php:670 #: include/views/configuration.host.prototype.edit.php:338 #: include/views/configuration.httpconf.edit.php:164 -#: include/views/configuration.item.edit.php:344 -#: include/views/configuration.item.edit.php:600 -#: include/views/configuration.item.edit.php:636 -#: include/views/configuration.item.massupdate.php:299 -#: include/views/configuration.item.massupdate.php:331 -#: include/views/configuration.item.prototype.edit.php:332 -#: include/views/configuration.item.prototype.edit.php:540 -#: include/views/configuration.item.prototype.edit.php:568 +#: include/views/configuration.item.edit.php:335 +#: include/views/configuration.item.edit.php:586 +#: include/views/configuration.item.edit.php:623 +#: include/views/configuration.item.massupdate.php:285 +#: include/views/configuration.item.massupdate.php:313 +#: include/views/configuration.item.prototype.edit.php:320 +#: include/views/configuration.item.prototype.edit.php:526 +#: include/views/configuration.item.prototype.edit.php:555 #: include/views/configuration.item.prototype.massupdate.php:280 #: include/views/configuration.item.prototype.massupdate.php:308 #: include/views/general.login.php:64 -#: include/views/js/common.item.edit.js.php:521 items.php:263 +#: include/views/js/common.item.edit.js.php:251 items.php:263 msgid "Password" msgstr "密码" @@ -12604,17 +12618,17 @@ msgid "Performs a DNS query. Returns character string with the required type of msgstr "执行DNS查询。返回字符串信息" #: app/views/report.services.php:31 -#: include/views/configuration.host.discovery.edit.php:518 -#: include/views/configuration.item.edit.php:700 -#: include/views/configuration.item.massupdate.php:457 -#: include/views/configuration.item.prototype.edit.php:629 -#: include/views/configuration.item.prototype.massupdate.php:435 +#: include/views/configuration.host.discovery.edit.php:506 +#: include/views/configuration.item.edit.php:687 +#: include/views/configuration.item.massupdate.php:339 +#: include/views/configuration.item.prototype.edit.php:616 +#: include/views/configuration.item.prototype.massupdate.php:335 #: include/views/configuration.maintenance.edit.php:77 report4.php:104 #: srv_status.php:170 msgid "Period" msgstr "期间" -#: include/forms.inc.php:1872 +#: include/forms.inc.php:2120 #: include/views/configuration.maintenance.edit.php:77 #: include/views/configuration.services.edit.php:226 msgid "Period type" @@ -12721,24 +12735,24 @@ msgstr "点" msgid "Polish (pl_PL)" msgstr "波兰(pl_PL)" -#: include/views/configuration.item.edit.php:915 +#: include/views/configuration.item.edit.php:900 msgid "Populates host inventory field" msgstr "填入主机资产纪录栏位" -#: app/views/administration.authentication.edit.php:88 +#: app/views/administration.authentication.edit.php:92 #: app/views/administration.proxy.edit.php:43 disc_prototypes.php:121 #: host_discovery.php:105 include/classes/setup/CSetupWizard.php:279 #: include/forms.inc.php:472 include/views/configuration.action.edit.php:995 #: include/views/configuration.action.edit.php:1777 #: include/views/configuration.action.edit.php:2236 -#: include/views/configuration.host.discovery.edit.php:448 +#: include/views/configuration.host.discovery.edit.php:436 #: include/views/configuration.host.edit.php:111 #: include/views/configuration.host.edit.php:194 #: include/views/configuration.host.list.php:113 #: include/views/configuration.host.prototype.edit.php:86 -#: include/views/configuration.item.edit.php:586 -#: include/views/configuration.item.massupdate.php:266 -#: include/views/configuration.item.prototype.edit.php:527 +#: include/views/configuration.item.edit.php:572 +#: include/views/configuration.item.massupdate.php:255 +#: include/views/configuration.item.prototype.edit.php:513 #: include/views/configuration.item.prototype.massupdate.php:250 #: include/views/inventory.host.view.php:72 items.php:131 items.php:304 #: setup.php:50 @@ -12778,15 +12792,17 @@ msgstr "发布类型" msgid "Pre-installation summary" msgstr "安装前汇总" -#: include/views/configuration.item.edit.php:1161 -#: include/views/configuration.item.prototype.edit.php:994 +#: include/views/configuration.host.discovery.edit.php:742 +#: include/views/configuration.item.edit.php:918 +#: include/views/configuration.item.prototype.edit.php:754 msgid "Preprocessing" msgstr "进程" -#: include/views/configuration.item.edit.php:1156 -#: include/views/configuration.item.massupdate.php:438 -#: include/views/configuration.item.prototype.edit.php:989 -#: include/views/configuration.item.prototype.massupdate.php:415 +#: include/views/configuration.host.discovery.edit.php:744 +#: include/views/configuration.item.edit.php:920 +#: include/views/configuration.item.massupdate.php:320 +#: include/views/configuration.item.prototype.edit.php:756 +#: include/views/configuration.item.prototype.massupdate.php:315 msgid "Preprocessing steps" msgstr "预定步骤" @@ -12837,19 +12853,19 @@ msgstr "主要的POC电话B" msgid "Primary POC screen name" msgstr "主要的POC屏幕名称" -#: include/views/configuration.host.discovery.edit.php:443 -#: include/views/configuration.item.edit.php:581 -#: include/views/configuration.item.massupdate.php:257 -#: include/views/configuration.item.prototype.edit.php:522 +#: include/views/configuration.host.discovery.edit.php:431 +#: include/views/configuration.item.edit.php:567 +#: include/views/configuration.item.massupdate.php:247 +#: include/views/configuration.item.prototype.edit.php:508 #: include/views/configuration.item.prototype.massupdate.php:242 #: include/views/js/configuration.discovery.edit.js.php:118 msgid "Privacy passphrase" msgstr "私钥" -#: include/views/configuration.host.discovery.edit.php:436 -#: include/views/configuration.item.edit.php:575 -#: include/views/configuration.item.massupdate.php:243 -#: include/views/configuration.item.prototype.edit.php:515 +#: include/views/configuration.host.discovery.edit.php:424 +#: include/views/configuration.item.edit.php:562 +#: include/views/configuration.item.massupdate.php:234 +#: include/views/configuration.item.prototype.edit.php:501 #: include/views/configuration.item.prototype.massupdate.php:230 #: include/views/js/configuration.discovery.edit.js.php:110 msgid "Privacy protocol" @@ -12865,10 +12881,10 @@ msgstr "Private（私人的）" #: include/views/configuration.action.edit.php:974 #: include/views/configuration.action.edit.php:1754 #: include/views/configuration.action.edit.php:2217 -#: include/views/configuration.host.discovery.edit.php:483 -#: include/views/configuration.item.edit.php:630 -#: include/views/configuration.item.massupdate.php:323 -#: include/views/configuration.item.prototype.edit.php:562 +#: include/views/configuration.host.discovery.edit.php:472 +#: include/views/configuration.item.edit.php:617 +#: include/views/configuration.item.massupdate.php:306 +#: include/views/configuration.item.prototype.edit.php:549 #: include/views/configuration.item.prototype.massupdate.php:301 msgid "Private key file" msgstr "私钥文件" @@ -13065,10 +13081,10 @@ msgstr "公开" #: include/views/configuration.action.edit.php:953 #: include/views/configuration.action.edit.php:1731 #: include/views/configuration.action.edit.php:2198 -#: include/views/configuration.host.discovery.edit.php:462 -#: include/views/configuration.item.edit.php:601 -#: include/views/configuration.item.massupdate.php:300 -#: include/views/configuration.item.prototype.edit.php:541 +#: include/views/configuration.host.discovery.edit.php:450 +#: include/views/configuration.item.edit.php:587 +#: include/views/configuration.item.massupdate.php:286 +#: include/views/configuration.item.prototype.edit.php:527 #: include/views/configuration.item.prototype.massupdate.php:281 msgid "Public key" msgstr "公钥" @@ -13076,18 +13092,18 @@ msgstr "公钥" #: include/views/configuration.action.edit.php:966 #: include/views/configuration.action.edit.php:1745 #: include/views/configuration.action.edit.php:2209 -#: include/views/configuration.host.discovery.edit.php:476 -#: include/views/configuration.item.edit.php:623 -#: include/views/configuration.item.massupdate.php:315 -#: include/views/configuration.item.prototype.edit.php:555 +#: include/views/configuration.host.discovery.edit.php:465 +#: include/views/configuration.item.edit.php:610 +#: include/views/configuration.item.massupdate.php:299 +#: include/views/configuration.item.prototype.edit.php:542 #: include/views/configuration.item.prototype.massupdate.php:294 msgid "Public key file" msgstr "公钥文件" #: app/views/popup.httpstep.php:65 -#: include/views/configuration.host.discovery.edit.php:106 -#: include/views/configuration.item.edit.php:138 -#: include/views/configuration.item.prototype.edit.php:126 +#: include/views/configuration.host.discovery.edit.php:105 +#: include/views/configuration.item.edit.php:140 +#: include/views/configuration.item.prototype.edit.php:125 msgid "Query fields" msgstr "查询字段" @@ -13113,10 +13129,10 @@ msgid "RMCP+" msgstr "RMCP+" #: app/views/popup.httpstep.php:76 -#: include/views/configuration.host.discovery.edit.php:171 -#: include/views/configuration.item.edit.php:203 -#: include/views/configuration.item.massupdate.php:118 -#: include/views/configuration.item.prototype.edit.php:191 +#: include/views/configuration.host.discovery.edit.php:167 +#: include/views/configuration.item.edit.php:202 +#: include/views/configuration.item.massupdate.php:116 +#: include/views/configuration.item.prototype.edit.php:187 #: include/views/configuration.item.prototype.massupdate.php:112 msgid "Raw data" msgstr "原始数据" @@ -13210,8 +13226,8 @@ msgstr "恢复" msgid "Recovery expression" msgstr "恢复表达式" -#: include/forms.inc.php:1690 include/forms.inc.php:1695 -#: include/forms.inc.php:1703 +#: include/forms.inc.php:1938 include/forms.inc.php:1943 +#: include/forms.inc.php:1951 msgid "Recovery expression syntax error." msgstr "恢复表达式语法错误。" @@ -13259,8 +13275,8 @@ msgstr "刷新不支持的项目 \"%1$s\" 。" msgid "Regular" msgstr "" -#: include/audit.inc.php:49 include/items.inc.php:1728 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/audit.inc.php:49 include/items.inc.php:1713 +#: include/views/configuration.host.discovery.edit.php:605 msgid "Regular expression" msgstr "正则表达式" @@ -13321,7 +13337,7 @@ msgstr "远程命令" #: app/views/popup.triggerwizard.js.php:335 #: app/views/popup.triggerwizard.php:57 app/views/popup.triggerwizard.php:101 #: include/classes/widgets/CWidgetHelper.php:408 -#: include/classes/widgets/CWidgetHelper.php:452 +#: include/classes/widgets/CWidgetHelper.php:452 include/forms.inc.php:1593 #: include/views/administration.general.iconmap.edit.php:84 #: include/views/administration.general.macros.edit.php:56 #: include/views/administration.general.regularexpressions.edit.php:77 @@ -13337,28 +13353,25 @@ msgstr "远程命令" #: include/views/configuration.action.edit.php:1916 #: include/views/configuration.correlation.edit.php:76 #: include/views/configuration.correlation.edit.php:230 -#: include/views/configuration.host.discovery.edit.php:131 -#: include/views/configuration.host.discovery.edit.php:226 -#: include/views/configuration.host.discovery.edit.php:547 -#: include/views/configuration.host.discovery.edit.php:660 +#: include/views/configuration.host.discovery.edit.php:130 +#: include/views/configuration.host.discovery.edit.php:222 +#: include/views/configuration.host.discovery.edit.php:535 +#: include/views/configuration.host.discovery.edit.php:648 +#: include/views/configuration.host.discovery.edit.php:717 #: include/views/configuration.httpconf.edit.php:243 -#: include/views/configuration.item.edit.php:163 -#: include/views/configuration.item.edit.php:258 -#: include/views/configuration.item.edit.php:741 -#: include/views/configuration.item.edit.php:1129 -#: include/views/configuration.item.massupdate.php:170 -#: include/views/configuration.item.massupdate.php:421 -#: include/views/configuration.item.massupdate.php:489 -#: include/views/configuration.item.massupdate.php:612 -#: include/views/configuration.item.prototype.edit.php:151 -#: include/views/configuration.item.prototype.edit.php:246 -#: include/views/configuration.item.prototype.edit.php:658 -#: include/views/configuration.item.prototype.edit.php:962 +#: include/views/configuration.item.edit.php:165 +#: include/views/configuration.item.edit.php:257 +#: include/views/configuration.item.edit.php:728 +#: include/views/configuration.item.massupdate.php:168 +#: include/views/configuration.item.massupdate.php:371 +#: include/views/configuration.item.massupdate.php:494 +#: include/views/configuration.item.prototype.edit.php:150 +#: include/views/configuration.item.prototype.edit.php:242 +#: include/views/configuration.item.prototype.edit.php:645 #: include/views/configuration.item.prototype.massupdate.php:164 -#: include/views/configuration.item.prototype.massupdate.php:398 -#: include/views/configuration.item.prototype.massupdate.php:467 -#: include/views/configuration.item.prototype.massupdate.php:568 -#: include/views/configuration.item.prototype.massupdate.php:643 +#: include/views/configuration.item.prototype.massupdate.php:367 +#: include/views/configuration.item.prototype.massupdate.php:468 +#: include/views/configuration.item.prototype.massupdate.php:543 #: include/views/configuration.maintenance.edit.php:95 #: include/views/configuration.maintenance.edit.php:193 #: include/views/configuration.maintenance.edit.php:213 @@ -13385,24 +13398,24 @@ msgstr "远程命令" #: include/views/js/adm.regexprs.edit.js.php:12 #: include/views/js/common.filter.trigger.js.php:14 #: include/views/js/common.item.edit.js.php:22 -#: include/views/js/common.item.edit.js.php:64 #: include/views/js/configuration.action.edit.js.php:9 #: include/views/js/configuration.action.edit.js.php:21 #: include/views/js/configuration.action.edit.js.php:35 #: include/views/js/configuration.action.edit.js.php:49 #: include/views/js/configuration.discovery.edit.js.php:10 #: include/views/js/configuration.graph.edit.js.php:93 -#: include/views/js/configuration.host.discovery.edit.js.php:31 +#: include/views/js/configuration.host.discovery.edit.js.php:33 +#: include/views/js/configuration.host.discovery.edit.js.php:53 #: include/views/js/configuration.host.edit.js.php:47 #: include/views/js/configuration.host.prototype.edit.js.php:7 #: include/views/js/configuration.httpconf.edit.js.php:21 -#: include/views/js/configuration.item.massupdate.js.php:22 -#: include/views/js/configuration.item.massupdate.js.php:47 +#: include/views/js/configuration.item.massupdate.js.php:26 #: include/views/js/configuration.maintenance.edit.js.php:14 #: include/views/js/configuration.services.edit.js.php:81 #: include/views/js/configuration.triggers.edit.js.php:11 #: include/views/js/configuration.triggers.list.js.php:14 #: include/views/js/hostmacros.js.php:14 include/views/js/hostmacros.js.php:46 +#: include/views/js/item.preprocessing.js.php:32 #: include/views/js/monitoring.screen.edit.js.php:24 #: include/views/js/monitoring.screen.edit.js.php:58 #: include/views/js/monitoring.slideconf.edit.js.php:16 @@ -13428,7 +13441,7 @@ msgstr "远程命令" msgid "Remove" msgstr "移除" -#: app/views/administration.authentication.edit.php:47 +#: app/views/administration.authentication.edit.php:48 msgid "Remove domain name" msgstr "" @@ -13467,9 +13480,9 @@ msgid "Removed, %1$s" msgstr "" #: include/views/configuration.host.massupdate.php:214 -#: include/views/configuration.item.massupdate.php:611 -#: include/views/configuration.item.prototype.massupdate.php:567 -#: include/views/configuration.item.prototype.massupdate.php:642 +#: include/views/configuration.item.massupdate.php:493 +#: include/views/configuration.item.prototype.massupdate.php:467 +#: include/views/configuration.item.prototype.massupdate.php:542 #: include/views/configuration.trigger.prototype.edit.php:144 #: include/views/configuration.trigger.prototype.edit.php:336 #: include/views/configuration.triggers.edit.php:165 @@ -13495,29 +13508,29 @@ msgstr "替换标记" msgid "Reports" msgstr "报表" -#: include/views/configuration.host.discovery.edit.php:181 -#: include/views/configuration.item.edit.php:213 -#: include/views/configuration.item.massupdate.php:128 -#: include/views/configuration.item.prototype.edit.php:201 +#: include/views/configuration.host.discovery.edit.php:176 +#: include/views/configuration.item.edit.php:211 +#: include/views/configuration.item.massupdate.php:125 +#: include/views/configuration.item.prototype.edit.php:196 #: include/views/configuration.item.prototype.massupdate.php:121 msgid "Request body" msgstr "" -#: include/views/configuration.host.discovery.edit.php:169 -#: include/views/configuration.item.edit.php:201 -#: include/views/configuration.item.massupdate.php:114 -#: include/views/configuration.item.prototype.edit.php:189 +#: include/views/configuration.host.discovery.edit.php:165 +#: include/views/configuration.item.edit.php:200 +#: include/views/configuration.item.massupdate.php:112 +#: include/views/configuration.item.prototype.edit.php:185 #: include/views/configuration.item.prototype.massupdate.php:108 msgid "Request body type" msgstr "" -#: host_discovery.php:284 host_discovery.php:529 items.php:967 items.php:1416 +#: host_discovery.php:288 host_discovery.php:608 items.php:967 items.php:1417 msgid "Request sent successfully" msgstr "" -#: include/views/configuration.host.discovery.edit.php:147 -#: include/views/configuration.item.edit.php:179 -#: include/views/configuration.item.prototype.edit.php:167 +#: include/views/configuration.host.discovery.edit.php:145 +#: include/views/configuration.item.edit.php:180 +#: include/views/configuration.item.prototype.edit.php:165 msgid "Request type" msgstr "" @@ -13543,9 +13556,9 @@ msgid "Required server performance, new values per second" msgstr "要求的主机性能, 每秒新值" #: app/views/popup.httpstep.php:155 -#: include/views/configuration.host.discovery.edit.php:242 -#: include/views/configuration.item.edit.php:274 -#: include/views/configuration.item.prototype.edit.php:262 +#: include/views/configuration.host.discovery.edit.php:237 +#: include/views/configuration.item.edit.php:272 +#: include/views/configuration.item.prototype.edit.php:257 msgid "Required status codes" msgstr "要求的状态码" @@ -13649,9 +13662,9 @@ msgid "Result type" msgstr "结果类型" #: app/views/popup.httpstep.php:140 -#: include/views/configuration.host.discovery.edit.php:259 -#: include/views/configuration.item.edit.php:291 -#: include/views/configuration.item.prototype.edit.php:279 +#: include/views/configuration.host.discovery.edit.php:252 +#: include/views/configuration.item.edit.php:287 +#: include/views/configuration.item.prototype.edit.php:272 msgid "Retrieve mode" msgstr "" @@ -13716,7 +13729,7 @@ msgstr "右" msgid "Right Y" msgstr "" -#: include/items.inc.php:1730 +#: include/items.inc.php:1721 msgid "Right trim" msgstr "调整右边" @@ -13805,11 +13818,11 @@ msgctxt "Sunday short" msgid "S" msgstr "S" -#: include/views/configuration.host.discovery.edit.php:427 -#: include/views/configuration.item.edit.php:537 -#: include/views/configuration.item.edit.php:544 -#: include/views/configuration.item.massupdate.php:226 -#: include/views/configuration.item.prototype.edit.php:506 +#: include/views/configuration.host.discovery.edit.php:415 +#: include/views/configuration.item.edit.php:523 +#: include/views/configuration.item.edit.php:530 +#: include/views/configuration.item.massupdate.php:219 +#: include/views/configuration.item.prototype.edit.php:492 #: include/views/configuration.item.prototype.massupdate.php:215 #: include/views/js/configuration.discovery.edit.js.php:98 msgid "SHA" @@ -13854,18 +13867,18 @@ msgid "SNMP" msgstr "SNMP" #: disc_prototypes.php:114 host_discovery.php:100 include/forms.inc.php:453 -#: include/views/configuration.host.discovery.edit.php:393 -#: include/views/configuration.item.edit.php:488 -#: include/views/configuration.item.prototype.edit.php:472 +#: include/views/configuration.host.discovery.edit.php:378 +#: include/views/configuration.item.edit.php:474 +#: include/views/configuration.item.prototype.edit.php:457 #: include/views/js/configuration.discovery.edit.js.php:64 items.php:124 msgid "SNMP OID" msgstr "SNMP OID" #: disc_prototypes.php:107 host_discovery.php:95 include/forms.inc.php:428 -#: include/views/configuration.host.discovery.edit.php:405 -#: include/views/configuration.item.edit.php:501 -#: include/views/configuration.item.massupdate.php:185 -#: include/views/configuration.item.prototype.edit.php:484 +#: include/views/configuration.host.discovery.edit.php:390 +#: include/views/configuration.item.edit.php:487 +#: include/views/configuration.item.massupdate.php:182 +#: include/views/configuration.item.prototype.edit.php:469 #: include/views/configuration.item.prototype.massupdate.php:178 #: include/views/js/configuration.discovery.edit.js.php:48 items.php:117 msgid "SNMP community" @@ -13907,9 +13920,9 @@ msgid "SQL count: %1$s (selects: %2$s | executes: %3$s)" msgstr "SQL count: %1$s (selects: %2$s | executes: %3$s)" #: include/items.inc.php:1680 -#: include/views/configuration.host.discovery.edit.php:501 -#: include/views/configuration.item.edit.php:649 -#: include/views/configuration.item.prototype.edit.php:580 +#: include/views/configuration.host.discovery.edit.php:490 +#: include/views/configuration.item.edit.php:636 +#: include/views/configuration.item.prototype.edit.php:567 msgid "SQL query" msgstr "SQL查询" @@ -13936,40 +13949,40 @@ msgstr "SSH" msgid "SSH agent" msgstr "SSH 客户端" -#: include/views/configuration.host.discovery.edit.php:330 +#: include/views/configuration.host.discovery.edit.php:316 #: include/views/configuration.httpconf.edit.php:175 -#: include/views/configuration.item.edit.php:371 -#: include/views/configuration.item.prototype.edit.php:359 +#: include/views/configuration.item.edit.php:359 +#: include/views/configuration.item.prototype.edit.php:344 msgid "SSL certificate file" msgstr "SSL证书文件" -#: include/views/configuration.host.discovery.edit.php:339 +#: include/views/configuration.host.discovery.edit.php:324 #: include/views/configuration.httpconf.edit.php:178 -#: include/views/configuration.item.edit.php:379 -#: include/views/configuration.item.prototype.edit.php:367 +#: include/views/configuration.item.edit.php:366 +#: include/views/configuration.item.prototype.edit.php:351 msgid "SSL key file" msgstr "SSL秘钥文件" -#: include/views/configuration.host.discovery.edit.php:347 +#: include/views/configuration.host.discovery.edit.php:331 #: include/views/configuration.httpconf.edit.php:181 -#: include/views/configuration.item.edit.php:387 -#: include/views/configuration.item.prototype.edit.php:375 +#: include/views/configuration.item.edit.php:373 +#: include/views/configuration.item.prototype.edit.php:358 msgid "SSL key password" msgstr "SSL秘钥密码" #: app/views/administration.mediatype.edit.php:88 -#: include/views/configuration.host.discovery.edit.php:321 +#: include/views/configuration.host.discovery.edit.php:308 #: include/views/configuration.httpconf.edit.php:172 -#: include/views/configuration.item.edit.php:362 -#: include/views/configuration.item.prototype.edit.php:350 +#: include/views/configuration.item.edit.php:351 +#: include/views/configuration.item.prototype.edit.php:336 msgid "SSL verify host" msgstr "SSL验证主机" #: app/views/administration.mediatype.edit.php:87 -#: include/views/configuration.host.discovery.edit.php:312 +#: include/views/configuration.host.discovery.edit.php:300 #: include/views/configuration.httpconf.edit.php:169 -#: include/views/configuration.item.edit.php:353 -#: include/views/configuration.item.prototype.edit.php:341 +#: include/views/configuration.item.edit.php:343 +#: include/views/configuration.item.prototype.edit.php:328 msgid "SSL verify peer" msgstr "SSL验证对端" @@ -13993,7 +14006,7 @@ msgstr "无衬线字体" msgid "Sat" msgstr "六" -#: include/forms.inc.php:1937 include/forms.inc.php:2052 +#: include/forms.inc.php:2185 include/forms.inc.php:2300 #: include/func.inc.php:140 include/func.inc.php:230 jsLoader.php:150 msgid "Saturday" msgstr "周六" @@ -14019,14 +14032,14 @@ msgstr "排程" msgid "Scheduled check" msgstr "时刻表检查" -#: include/views/configuration.host.discovery.edit.php:524 -#: include/views/configuration.item.edit.php:708 -#: include/views/configuration.item.edit.php:715 -#: include/views/configuration.item.massupdate.php:466 -#: include/views/configuration.item.prototype.edit.php:635 -#: include/views/configuration.item.prototype.massupdate.php:444 +#: include/views/configuration.host.discovery.edit.php:512 +#: include/views/configuration.item.edit.php:695 +#: include/views/configuration.item.edit.php:702 +#: include/views/configuration.item.massupdate.php:348 +#: include/views/configuration.item.prototype.edit.php:622 +#: include/views/configuration.item.prototype.massupdate.php:344 #: include/views/js/common.item.edit.js.php:10 -#: include/views/js/configuration.item.massupdate.js.php:10 +#: include/views/js/configuration.item.massupdate.js.php:14 msgid "Scheduling" msgstr "调度" @@ -14197,7 +14210,7 @@ msgstr "脚本" msgid "Search" msgstr "搜索" -#: app/views/administration.authentication.edit.php:98 +#: app/views/administration.authentication.edit.php:104 msgid "Search attribute" msgstr "搜索属性" @@ -14237,20 +14250,20 @@ msgstr "第二个POC聚合图形名称" msgid "Seconds" msgstr "秒" -#: include/views/configuration.host.discovery.edit.php:423 -#: include/views/configuration.item.edit.php:530 -#: include/views/configuration.item.massupdate.php:209 -#: include/views/configuration.item.prototype.edit.php:502 +#: include/views/configuration.host.discovery.edit.php:404 +#: include/views/configuration.item.edit.php:516 +#: include/views/configuration.item.massupdate.php:203 +#: include/views/configuration.item.prototype.edit.php:481 #: include/views/configuration.item.prototype.massupdate.php:199 #: include/views/js/configuration.discovery.edit.js.php:86 msgid "Security level" msgstr "安全级别" #: include/forms.inc.php:432 -#: include/views/configuration.host.discovery.edit.php:411 -#: include/views/configuration.item.edit.php:507 -#: include/views/configuration.item.massupdate.php:201 -#: include/views/configuration.item.prototype.edit.php:490 +#: include/views/configuration.host.discovery.edit.php:396 +#: include/views/configuration.item.edit.php:493 +#: include/views/configuration.item.massupdate.php:196 +#: include/views/configuration.item.prototype.edit.php:475 #: include/views/configuration.item.prototype.massupdate.php:192 #: include/views/js/configuration.discovery.edit.js.php:79 msgid "Security name" @@ -14278,9 +14291,9 @@ msgstr "安全名称" #: include/views/configuration.graph.edit.php:185 #: include/views/configuration.graph.edit.php:266 #: include/views/configuration.item.edit.php:91 -#: include/views/configuration.item.prototype.edit.php:79 -#: include/views/configuration.item.prototype.edit.php:394 -#: include/views/configuration.item.prototype.massupdate.php:604 +#: include/views/configuration.item.prototype.edit.php:77 +#: include/views/configuration.item.prototype.edit.php:377 +#: include/views/configuration.item.prototype.massupdate.php:504 #: include/views/configuration.services.edit.php:90 #: include/views/js/monitoring.sysmaps.js.php:191 #: include/views/js/monitoring.sysmaps.js.php:210 @@ -14300,8 +14313,8 @@ msgstr "选择" #: app/views/popup.triggerexpr.php:72 #: include/views/configuration.graph.edit.php:206 #: include/views/configuration.graph.edit.php:287 -#: include/views/configuration.item.prototype.edit.php:411 -#: include/views/configuration.item.prototype.massupdate.php:620 +#: include/views/configuration.item.prototype.edit.php:394 +#: include/views/configuration.item.prototype.massupdate.php:520 msgid "Select prototype" msgstr "选择原型" @@ -14405,7 +14418,7 @@ msgstr "九月" msgid "Separated" msgstr "分开的" -#: include/forms.inc.php:1975 include/func.inc.php:124 +#: include/forms.inc.php:2223 include/func.inc.php:124 #: include/func.inc.php:261 jsLoader.php:141 msgid "September" msgstr "九月" @@ -14543,9 +14556,7 @@ msgstr "会话已中断, 请重新登录." msgid "Set custom time period" msgstr "" -#: include/views/configuration.item.edit.php:1079 -#: include/views/configuration.item.prototype.edit.php:912 -#: include/views/js/common.item.edit.js.php:82 +#: include/forms.inc.php:1543 include/views/js/item.preprocessing.js.php:51 msgid "Set error to" msgstr "" @@ -14553,9 +14564,7 @@ msgstr "" msgid "Set host inventory mode" msgstr "设置主机清单模式" -#: include/views/configuration.item.edit.php:1078 -#: include/views/configuration.item.prototype.edit.php:911 -#: include/views/js/common.item.edit.js.php:81 +#: include/forms.inc.php:1542 include/views/js/item.preprocessing.js.php:50 msgid "Set value to" msgstr "" @@ -14751,10 +14760,10 @@ msgstr "仅显示未确认" msgid "Show unavailable maps" msgstr "显示不可用的地图" -#: include/views/configuration.item.edit.php:841 -#: include/views/configuration.item.massupdate.php:561 -#: include/views/configuration.item.prototype.edit.php:714 -#: include/views/configuration.item.prototype.massupdate.php:541 +#: include/views/configuration.item.edit.php:826 +#: include/views/configuration.item.massupdate.php:442 +#: include/views/configuration.item.prototype.edit.php:701 +#: include/views/configuration.item.prototype.massupdate.php:441 msgid "Show value" msgstr "查看值" @@ -14786,7 +14795,7 @@ msgstr "退出" msgid "Simple" msgstr "简单" -#: include/items.inc.php:1750 +#: include/items.inc.php:1741 msgid "Simple change" msgstr "简单更改" @@ -15086,7 +15095,7 @@ msgstr "" #: include/views/configuration.httpconf.list.php:95 #: include/views/configuration.item.list.php:71 #: include/views/configuration.item.list.php:152 -#: include/views/configuration.item.massupdate.php:536 +#: include/views/configuration.item.massupdate.php:420 #: include/views/configuration.triggers.list.php:46 #: include/views/configuration.triggers.list.php:171 srv_status.php:146 msgid "Status" @@ -15178,7 +15187,7 @@ msgstr "停止" msgid "Straight" msgstr "Straight" -#: include/items.inc.php:1735 +#: include/items.inc.php:1728 include/items.inc.php:1732 msgid "Structured data" msgstr "结构化数据" @@ -15231,7 +15240,7 @@ msgstr "网络接口上传下载的流量总和。返回整数" msgid "Sun" msgstr "日" -#: include/forms.inc.php:1942 include/forms.inc.php:2057 +#: include/forms.inc.php:2190 include/forms.inc.php:2305 #: include/func.inc.php:142 include/func.inc.php:224 jsLoader.php:151 msgid "Sunday" msgstr "日" @@ -15456,9 +15465,9 @@ msgstr "模板" msgid "Template \"%1$s\" already exists." msgstr "模板 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:1454 +#: include/classes/api/services/CHostGroup.php:1471 #: include/classes/api/services/CTemplate.php:368 -#: include/classes/api/services/CTemplate.php:988 +#: include/classes/api/services/CTemplate.php:986 #, c-format msgid "Template \"%1$s\" cannot be without host group." msgstr "模板 \"%1$s\" 不能没有主机组。" @@ -15518,25 +15527,25 @@ msgstr "模板已更新" msgid "Template value" msgstr "模板值" -#: include/classes/api/services/CTemplate.php:1043 +#: include/classes/api/services/CTemplate.php:1041 #, c-format msgid "Template with the same name \"%1$s\" already exists." msgstr "拥有相同名称 \"%1$s\"的模板已经存在." -#: include/classes/api/services/CHost.php:1757 -#: include/classes/api/services/CHost.php:1980 +#: include/classes/api/services/CHost.php:1793 +#: include/classes/api/services/CHost.php:2016 #, c-format msgid "Template with the same name \"%s\" already exists." msgstr "含有相同名称\"%1$s\"的模板已链接到主机." #: include/classes/api/services/CTemplate.php:447 -#: include/classes/api/services/CTemplate.php:1008 +#: include/classes/api/services/CTemplate.php:1006 #, c-format msgid "Template with the same visible name \"%1$s\" already exists." msgstr "拥有相同显示名称\"%1$s\"的模板已经存在." -#: include/classes/api/services/CHost.php:1763 -#: include/classes/api/services/CHost.php:1988 +#: include/classes/api/services/CHost.php:1799 +#: include/classes/api/services/CHost.php:2024 #, c-format msgid "Template with the same visible name \"%s\" already exists." msgstr "含有相同可视名称\"%1$s\"的模板已链接到主机." @@ -15570,7 +15579,7 @@ msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"." msgstr "模板\"%1$s\"自主机\"%2$s\"断连." #: app/controllers/CControllerPopupTestTriggerExpr.php:147 -#: app/views/administration.authentication.edit.php:140 +#: app/views/administration.authentication.edit.php:150 #: app/views/popup.testtriggerexpr.php:110 #: include/views/administration.general.regularexpressions.edit.php:139 #: include/views/configuration.trigger.prototype.edit.php:239 @@ -15580,7 +15589,7 @@ msgstr "模板\"%1$s\"自主机\"%2$s\"断连." msgid "Test" msgstr "测试" -#: app/views/administration.authentication.edit.php:114 +#: app/views/administration.authentication.edit.php:122 msgid "Test authentication" msgstr "测试认证" @@ -15602,9 +15611,11 @@ msgid "Test string" msgstr "测试字符串" #: include/forms.inc.php:355 include/items.inc.php:135 -#: include/items.inc.php:1726 include/views/configuration.item.edit.php:680 -#: include/views/configuration.item.massupdate.php:281 -#: include/views/configuration.item.prototype.edit.php:609 +#: include/items.inc.php:1712 include/items.inc.php:1716 +#: include/items.inc.php:1720 include/items.inc.php:1724 +#: include/views/configuration.item.edit.php:667 +#: include/views/configuration.item.massupdate.php:269 +#: include/views/configuration.item.prototype.edit.php:596 #: include/views/configuration.item.prototype.massupdate.php:264 #: include/views/js/monitoring.sysmaps.js.php:308 #: include/views/js/monitoring.sysmaps.js.php:459 @@ -15752,7 +15763,7 @@ msgstr "" msgid "Threshold" msgstr "阀值" -#: include/items.inc.php:1774 +#: include/items.inc.php:1784 include/items.inc.php:1788 msgid "Throttling" msgstr "" @@ -15760,7 +15771,7 @@ msgstr "" msgid "Thu" msgstr "四" -#: include/forms.inc.php:1927 include/forms.inc.php:2042 +#: include/forms.inc.php:2175 include/forms.inc.php:2290 #: include/func.inc.php:138 include/func.inc.php:228 jsLoader.php:148 msgid "Thursday" msgstr "周四" @@ -15841,10 +15852,10 @@ msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\"). msgstr "PHP的时区未设置(配置参数\"date.timezone\")." #: app/views/popup.httpstep.php:147 -#: include/views/configuration.host.discovery.edit.php:162 +#: include/views/configuration.host.discovery.edit.php:159 #: include/views/configuration.httpconf.edit.php:196 #: include/views/configuration.item.edit.php:194 -#: include/views/configuration.item.prototype.edit.php:182 +#: include/views/configuration.item.prototype.edit.php:179 msgid "Timeout" msgstr "超时" @@ -15955,10 +15966,10 @@ msgstr "趋势数据存储时间" msgid "Trend data storage period \"%1$s\"." msgstr "趋势数据存储期 \"%1$s\"。" -#: disc_prototypes.php:198 include/views/configuration.item.edit.php:809 -#: include/views/configuration.item.massupdate.php:524 -#: include/views/configuration.item.prototype.edit.php:688 -#: include/views/configuration.item.prototype.massupdate.php:503 items.php:77 +#: disc_prototypes.php:198 include/views/configuration.item.edit.php:797 +#: include/views/configuration.item.massupdate.php:407 +#: include/views/configuration.item.prototype.edit.php:676 +#: include/views/configuration.item.prototype.massupdate.php:403 items.php:77 msgid "Trend storage period" msgstr "趋势存储时间" @@ -15998,7 +16009,7 @@ msgstr "触发器\"%1$s\"已存在于\"%2$s\"." msgid "Trigger \"%1$s\" belongs to templates with different linkages." msgstr "触发器\"%1$s\"属于不同的联系，以模板。" -#: include/classes/import/CConfigurationImport.php:1610 +#: include/classes/import/CConfigurationImport.php:1618 #, c-format msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist." msgstr "触发器\"%1$s\"相依于一个不存在的触发器\"%2$s\"." @@ -16113,7 +16124,7 @@ msgstr "触发器原型模板\"%1$s\"属于不同的联系，以模板。" msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules." msgstr "触发器模板\"%1$s\"中包含了来自多个自动发现规则的项目模板." -#: include/classes/import/CConfigurationImport.php:1332 +#: include/classes/import/CConfigurationImport.php:1340 #, c-format msgid "Trigger prototype \"%1$s\" depends on trigger \"%2$s\", which does not exist." msgstr "触发器模板 \"%1$s\" 依赖于触发器 \"%2$s\" ,但它不存在。" @@ -16218,7 +16229,7 @@ msgstr "触发器已删除" msgid "Triggers top 100" msgstr "触发器 Top 100" -#: include/items.inc.php:1729 +#: include/items.inc.php:1717 msgid "Trim" msgstr "修整" @@ -16231,7 +16242,7 @@ msgstr "尝试读取不能存取的属性\"%s\"." msgid "Tue" msgstr "二" -#: include/forms.inc.php:1917 include/forms.inc.php:2032 +#: include/forms.inc.php:2165 include/forms.inc.php:2280 #: include/func.inc.php:136 include/func.inc.php:226 jsLoader.php:146 msgid "Tuesday" msgstr "周二" @@ -16240,7 +16251,7 @@ msgstr "周二" msgid "Turkish (tr_TR)" msgstr "土耳其语 (tr_TR)" -#: include/classes/api/services/CItem.php:1015 +#: include/classes/api/services/CItem.php:965 #, c-format msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict." msgstr "两个项目 (\"%1$s\"和\"%2$s\")不能填入一个主机资产纪录栏位\"%3$s\", 这会造成冲突." @@ -16271,22 +16282,22 @@ msgstr "" #: include/views/configuration.action.edit.php:1706 #: include/views/configuration.action.edit.php:2156 #: include/views/configuration.graph.edit.php:332 -#: include/views/configuration.host.discovery.edit.php:56 -#: include/views/configuration.host.discovery.edit.php:61 -#: include/views/configuration.host.discovery.edit.php:518 +#: include/views/configuration.host.discovery.edit.php:54 +#: include/views/configuration.host.discovery.edit.php:59 +#: include/views/configuration.host.discovery.edit.php:506 #: include/views/configuration.host.discovery.list.php:58 #: include/views/configuration.item.edit.php:73 #: include/views/configuration.item.edit.php:78 -#: include/views/configuration.item.edit.php:700 +#: include/views/configuration.item.edit.php:687 #: include/views/configuration.item.list.php:69 -#: include/views/configuration.item.massupdate.php:42 -#: include/views/configuration.item.massupdate.php:455 -#: include/views/configuration.item.prototype.edit.php:61 -#: include/views/configuration.item.prototype.edit.php:66 -#: include/views/configuration.item.prototype.edit.php:629 +#: include/views/configuration.item.massupdate.php:41 +#: include/views/configuration.item.massupdate.php:337 +#: include/views/configuration.item.prototype.edit.php:59 +#: include/views/configuration.item.prototype.edit.php:64 +#: include/views/configuration.item.prototype.edit.php:616 #: include/views/configuration.item.prototype.list.php:57 #: include/views/configuration.item.prototype.massupdate.php:37 -#: include/views/configuration.item.prototype.massupdate.php:433 +#: include/views/configuration.item.prototype.massupdate.php:333 #: include/views/configuration.maintenance.list.php:71 #: include/views/configuration.services.edit.php:170 #: include/views/inventory.host.list.php:67 @@ -16321,17 +16332,17 @@ msgstr "类型(降序)" #: include/views/configuration.action.edit.php:118 #: include/views/configuration.action.edit.php:1155 #: include/views/configuration.correlation.edit.php:91 -#: include/views/configuration.host.discovery.edit.php:594 +#: include/views/configuration.host.discovery.edit.php:582 msgid "Type of calculation" msgstr "计算方式" #: app/controllers/CControllerPopupGeneric.php:213 #: app/controllers/CControllerPopupGeneric.php:276 include/forms.inc.php:348 -#: include/forms.inc.php:842 include/views/configuration.item.edit.php:668 -#: include/views/configuration.item.edit.php:674 -#: include/views/configuration.item.massupdate.php:274 -#: include/views/configuration.item.prototype.edit.php:597 -#: include/views/configuration.item.prototype.edit.php:603 +#: include/forms.inc.php:842 include/views/configuration.item.edit.php:655 +#: include/views/configuration.item.edit.php:661 +#: include/views/configuration.item.massupdate.php:262 +#: include/views/configuration.item.prototype.edit.php:584 +#: include/views/configuration.item.prototype.edit.php:590 #: include/views/configuration.item.prototype.massupdate.php:257 msgid "Type of information" msgstr "信息类型" @@ -16350,15 +16361,15 @@ msgid "UNKNOWN" msgstr "未知的" #: app/views/popup.httpstep.php:50 app/views/popup.triggerwizard.php:183 -#: disc_prototypes.php:207 host_discovery.php:152 +#: disc_prototypes.php:207 host_discovery.php:153 #: include/classes/widgets/CWidgetConfig.php:50 #: include/classes/widgets/forms/CWidgetFormUrl.php:31 #: include/screens.inc.php:44 -#: include/views/configuration.host.discovery.edit.php:76 +#: include/views/configuration.host.discovery.edit.php:74 #: include/views/configuration.httpconf.edit.php:197 -#: include/views/configuration.item.edit.php:108 -#: include/views/configuration.item.massupdate.php:105 -#: include/views/configuration.item.prototype.edit.php:97 +#: include/views/configuration.item.edit.php:109 +#: include/views/configuration.item.massupdate.php:104 +#: include/views/configuration.item.prototype.edit.php:95 #: include/views/configuration.item.prototype.massupdate.php:100 #: include/views/configuration.trigger.prototype.edit.php:535 #: include/views/configuration.triggers.edit.php:569 @@ -16384,7 +16395,7 @@ msgstr "URL B" msgid "URL C" msgstr "URL C" -#: include/views/js/common.item.edit.js.php:732 +#: include/views/js/common.item.edit.js.php:323 #: include/views/js/configuration.httpconf.edit.js.php:654 msgid "URL is not properly encoded." msgstr "网址未正确编码。" @@ -16468,9 +16479,9 @@ msgstr "解除锁定所选的用户?" #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:154 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227 -#: include/views/configuration.item.edit.php:685 -#: include/views/configuration.item.massupdate.php:288 -#: include/views/configuration.item.prototype.edit.php:614 +#: include/views/configuration.item.edit.php:673 +#: include/views/configuration.item.massupdate.php:275 +#: include/views/configuration.item.prototype.edit.php:602 #: include/views/configuration.item.prototype.massupdate.php:270 msgid "Units" msgstr "单位" @@ -16565,42 +16576,42 @@ msgstr "自模板断开连接" msgid "Unlink from templates" msgstr "自模板断开链接" -#: include/classes/api/services/CHostGeneral.php:630 +#: include/classes/api/services/CHostGeneral.php:626 #, c-format msgid "Unlinked: Application \"%1$s\" on \"%2$s\"." msgstr "断开链接: 应用程序\"%1$s\"于\"%2$s\"." -#: include/classes/api/services/CHostGeneral.php:376 +#: include/classes/api/services/CHostGeneral.php:372 #, c-format msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"." msgstr "未链接的: 探索规则\"%1$s\"于\"%2$s\"." -#: include/classes/api/services/CHostGeneral.php:533 +#: include/classes/api/services/CHostGeneral.php:529 #, c-format msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"." msgstr "未链接的: 图形\"%1$s\"于\"%2$s\"." -#: include/classes/api/services/CHostGeneral.php:517 +#: include/classes/api/services/CHostGeneral.php:513 #, c-format msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"." msgstr "未链接的: 图形原型\"%1$s\"于\"%2$s\"." -#: include/classes/api/services/CHostGeneral.php:466 +#: include/classes/api/services/CHostGeneral.php:462 #, c-format msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"." msgstr "取消关联:\"%2$s\"上的主机模板\"%1$s\"." -#: include/classes/api/services/CHostGeneral.php:392 +#: include/classes/api/services/CHostGeneral.php:388 #, c-format msgid "Unlinked: Item \"%1$s\" on \"%2$s\"." msgstr "断开连接: \"%2$s\"上的监控项\"%1$s\"." -#: include/classes/api/services/CHostGeneral.php:411 +#: include/classes/api/services/CHostGeneral.php:407 #, c-format msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"." msgstr "断开连接: \"%2$s\"上的监控项原型\"%1$s\"." -#: include/classes/api/services/CHostGeneral.php:572 +#: include/classes/api/services/CHostGeneral.php:568 #, c-format msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"." msgstr "不能被链接:\"%2$s\" 上的 Web 场景 \"%1$s\"." @@ -16624,7 +16635,7 @@ msgstr "未支持的导入格式\"%1$s\"." msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"." msgstr "动作\"%1$s\"的过滤器条件不支持参数\"%2$s\"" -#: include/classes/api/services/CDiscoveryRule.php:1118 +#: include/classes/api/services/CDiscoveryRule.php:1282 #, c-format msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"." msgstr "自动发现规则 \"%1$s\"的过滤器条件不支持参数\"%2$s\"" @@ -16634,7 +16645,7 @@ msgstr "自动发现规则 \"%1$s\"的过滤器条件不支持参数\"%2$s\"" msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"." msgstr "动作\"%1$s\"的过滤器不支持参数\"%2$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1086 +#: include/classes/api/services/CDiscoveryRule.php:1250 #, c-format msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"." msgstr "自动发现规则\"%1$s\"的过滤器不支持参数\"%2$s\"." @@ -16649,7 +16660,7 @@ msgctxt "discovery status" msgid "Up" msgstr "上" -#: app/views/administration.authentication.edit.php:139 +#: app/views/administration.authentication.edit.php:149 #: app/views/administration.mediatype.edit.php:241 #: app/views/administration.proxy.edit.php:132 #: app/views/administration.script.edit.php:127 @@ -16679,16 +16690,16 @@ msgstr "上" #: include/views/configuration.correlation.edit.php:276 #: include/views/configuration.discovery.edit.php:108 #: include/views/configuration.graph.edit.php:449 -#: include/views/configuration.host.discovery.edit.php:709 +#: include/views/configuration.host.discovery.edit.php:771 #: include/views/configuration.host.edit.php:810 #: include/views/configuration.hostgroups.edit.php:57 #: include/views/configuration.host.massupdate.php:371 #: include/views/configuration.host.prototype.edit.php:434 #: include/views/configuration.httpconf.edit.php:306 -#: include/views/configuration.item.edit.php:1191 -#: include/views/configuration.item.massupdate.php:695 -#: include/views/configuration.item.prototype.edit.php:1003 -#: include/views/configuration.item.prototype.massupdate.php:689 +#: include/views/configuration.item.edit.php:953 +#: include/views/configuration.item.massupdate.php:577 +#: include/views/configuration.item.prototype.edit.php:768 +#: include/views/configuration.item.prototype.massupdate.php:589 #: include/views/configuration.maintenance.edit.php:134 #: include/views/configuration.maintenance.edit.php:285 #: include/views/configuration.services.edit.php:353 @@ -16712,12 +16723,12 @@ msgstr "更新现有的" #: discoveryconf.php:39 disc_prototypes.php:58 host_discovery.php:54 #: include/forms.inc.php:394 include/views/configuration.discovery.edit.php:59 -#: include/views/configuration.host.discovery.edit.php:508 +#: include/views/configuration.host.discovery.edit.php:496 #: include/views/configuration.httpconf.edit.php:80 -#: include/views/configuration.item.edit.php:690 -#: include/views/configuration.item.massupdate.php:510 -#: include/views/configuration.item.prototype.edit.php:619 -#: include/views/configuration.item.prototype.massupdate.php:489 items.php:57 +#: include/views/configuration.item.edit.php:677 +#: include/views/configuration.item.massupdate.php:393 +#: include/views/configuration.item.prototype.edit.php:606 +#: include/views/configuration.item.prototype.massupdate.php:389 items.php:57 #: items.php:306 msgid "Update interval" msgstr "更新间隔" @@ -16759,7 +16770,7 @@ msgstr "已更新: %s" msgid "Upload" msgstr "上传" -#: include/html.inc.php:542 include/html.inc.php:555 +#: include/html.inc.php:542 include/html.inc.php:545 msgid "Upper level maps" msgstr "上层拓扑图" @@ -16968,18 +16979,18 @@ msgstr "" #: include/views/configuration.action.edit.php:958 #: include/views/configuration.action.edit.php:1737 #: include/views/configuration.action.edit.php:2201 -#: include/views/configuration.host.discovery.edit.php:294 -#: include/views/configuration.host.discovery.edit.php:471 -#: include/views/configuration.item.edit.php:335 -#: include/views/configuration.item.edit.php:618 -#: include/views/configuration.item.massupdate.php:307 -#: include/views/configuration.item.prototype.edit.php:323 -#: include/views/configuration.item.prototype.edit.php:550 +#: include/views/configuration.host.discovery.edit.php:284 +#: include/views/configuration.host.discovery.edit.php:460 +#: include/views/configuration.item.edit.php:327 +#: include/views/configuration.item.edit.php:605 +#: include/views/configuration.item.massupdate.php:292 +#: include/views/configuration.item.prototype.edit.php:312 +#: include/views/configuration.item.prototype.edit.php:537 #: include/views/configuration.item.prototype.massupdate.php:287 items.php:90 msgid "User name" msgstr "用户名称" -#: app/views/administration.authentication.edit.php:120 +#: app/views/administration.authentication.edit.php:129 msgid "User password" msgstr "用户密码" @@ -17043,7 +17054,7 @@ msgstr "" #: app/views/administration.mediatype.edit.php:95 #: app/views/administration.mediatype.edit.php:159 #: app/views/administration.mediatype.list.php:93 disc_prototypes.php:259 -#: host_discovery.php:201 include/views/configuration.host.edit.php:666 +#: host_discovery.php:202 include/views/configuration.host.edit.php:666 #: include/views/configuration.host.prototype.edit.php:335 #: include/views/general.login.php:60 index.php:33 items.php:257 msgid "Username" @@ -17261,7 +17272,9 @@ msgstr "VMware 虚拟机非共享存储空间, <url> - VMware 服务 URL, <uuid> msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name" msgstr "VMware 虚拟机在线时间, <url> - VMware 服务 URL, <uuid> - VMware 虚拟机主机名" -#: include/items.inc.php:1763 +#: include/items.inc.php:1760 include/items.inc.php:1764 +#: include/items.inc.php:1768 include/items.inc.php:1772 +#: include/items.inc.php:1776 include/items.inc.php:1780 msgid "Validation" msgstr "" @@ -17274,14 +17287,14 @@ msgstr "" #: include/classes/screens/CScreenPlainText.php:53 #: include/views/administration.general.macros.edit.php:38 #: include/views/administration.general.valuemapping.edit.php:55 -#: include/views/configuration.host.discovery.edit.php:110 -#: include/views/configuration.host.discovery.edit.php:205 +#: include/views/configuration.host.discovery.edit.php:109 +#: include/views/configuration.host.discovery.edit.php:201 #: include/views/configuration.httpconf.edit.php:125 -#: include/views/configuration.item.edit.php:142 -#: include/views/configuration.item.edit.php:237 -#: include/views/configuration.item.massupdate.php:154 -#: include/views/configuration.item.prototype.edit.php:130 -#: include/views/configuration.item.prototype.edit.php:225 +#: include/views/configuration.item.edit.php:144 +#: include/views/configuration.item.edit.php:236 +#: include/views/configuration.item.massupdate.php:152 +#: include/views/configuration.item.prototype.edit.php:129 +#: include/views/configuration.item.prototype.edit.php:221 #: include/views/configuration.item.prototype.massupdate.php:148 #: include/views/configuration.triggers.list.php:55 #: include/views/configuration.triggers.list.php:167 @@ -17461,7 +17474,7 @@ msgstr "虚拟空间大小（以字节计）或百分比（总计）。 返回 msgid "Visible name" msgstr "可见的名称" -#: include/classes/api/services/CHost.php:1891 +#: include/classes/api/services/CHost.php:1927 msgid "Visible name cannot be empty if host name is missing." msgstr "如果缺少主机名称, 可见的名称不能为空." @@ -17523,7 +17536,7 @@ msgstr "Web 场景 \"%1$s\" 已经存在在主机 \"%2$s\"." msgid "Web scenario \"%1$s\" already exists." msgstr "Web 场景 \"%1$s\" 已经存在." -#: include/classes/import/CConfigurationImport.php:1382 +#: include/classes/import/CConfigurationImport.php:1390 #, c-format msgid "Web scenario \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist." msgstr "Web 脚本\"%1$s\"在\"%2$s\":应用\"%3$s\"不存在。" @@ -17560,12 +17573,12 @@ msgstr "Web 场景" msgid "Wed" msgstr "三" -#: include/forms.inc.php:1922 include/forms.inc.php:2037 +#: include/forms.inc.php:2170 include/forms.inc.php:2285 #: include/func.inc.php:137 include/func.inc.php:227 jsLoader.php:147 msgid "Wednesday" msgstr "周三" -#: app/views/report.services.php:35 include/forms.inc.php:1876 +#: app/views/report.services.php:35 include/forms.inc.php:2124 #: include/maintenances.inc.php:35 report4.php:108 msgid "Weekly" msgstr "每周" @@ -17665,8 +17678,8 @@ msgstr "写" msgid "Wrong fields for dependency for service \"%1$s\"." msgstr "错误的服务\"%1$s\"其依赖关系栏位." -#: include/classes/api/services/CHost.php:1605 -#: include/classes/api/services/CHost.php:1786 +#: include/classes/api/services/CHost.php:1641 +#: include/classes/api/services/CHost.php:1822 #, c-format msgid "Wrong fields for host \"%1$s\"." msgstr "错误的主机栏位\"%1$s\"." @@ -17745,23 +17758,27 @@ msgstr "X1" msgid "X2" msgstr "X2" -#: include/items.inc.php:1737 +#: include/items.inc.php:1729 msgid "XML XPath" msgstr "XML XPath" -#: include/views/configuration.host.discovery.edit.php:173 -#: include/views/configuration.item.edit.php:205 -#: include/views/configuration.item.massupdate.php:120 -#: include/views/configuration.item.prototype.edit.php:193 +#: include/views/configuration.host.discovery.edit.php:169 +#: include/views/configuration.item.edit.php:204 +#: include/views/configuration.item.massupdate.php:118 +#: include/views/configuration.item.prototype.edit.php:189 #: include/views/configuration.item.prototype.massupdate.php:114 msgid "XML data" msgstr "" -#: include/classes/api/services/CItemGeneral.php:2222 +#: include/classes/api/services/CItemGeneral.php:2185 #: include/classes/import/readers/CXmlImportReader.php:35 msgid "XML is empty" msgstr "XML空" +#: include/forms.inc.php:1469 include/views/js/item.preprocessing.js.php:154 +msgid "XPath" +msgstr "" + #: include/views/js/monitoring.sysmaps.js.php:248 #: include/views/js/monitoring.sysmaps.js.php:384 msgid "Y" @@ -17813,7 +17830,7 @@ msgstr "Y1" msgid "Y2" msgstr "Y2" -#: include/forms.inc.php:2092 +#: include/forms.inc.php:2340 #: include/views/configuration.maintenance.edit.php:57 #: include/views/configuration.maintenance.edit.php:63 #: include/views/configuration.services.edit.php:246 @@ -17826,7 +17843,7 @@ msgstr "" #: include/classes/import/validators/C32XmlValidator.php:1007 #: include/classes/import/validators/C34XmlValidator.php:1111 #: include/classes/import/validators/C40XmlValidator.php:1290 -#: include/classes/import/validators/C42XmlValidator.php:1298 +#: include/classes/import/validators/C42XmlValidator.php:1326 msgctxt "XML date and time format" msgid "YYYY-MM-DDThh:mm:ssZ" msgstr "YYYY-MM-DDThh:mm:ssZ" @@ -17913,8 +17930,8 @@ msgstr "您没有指定目标为动作操作的全域脚本\"%s\"." #: include/classes/api/services/CTemplate.php:388 #: include/classes/api/services/CTemplate.php:529 #: include/classes/api/services/CTemplate.php:561 -#: include/classes/api/services/CTemplate.php:980 -#: include/classes/api/services/CTemplate.php:1085 +#: include/classes/api/services/CTemplate.php:978 +#: include/classes/api/services/CTemplate.php:1083 #: include/classes/api/services/CUserMacro.php:266 #: include/classes/api/services/CUserMacro.php:350 #: include/classes/api/services/CUserMacro.php:443 @@ -17998,7 +18015,7 @@ msgstr "Zabbix内部" msgid "Zabbix internal authentication" msgstr "Zabbix内部认证" -#: app/views/administration.authentication.edit.php:43 +#: app/views/administration.authentication.edit.php:44 msgid "Zabbix login form" msgstr "" @@ -18072,7 +18089,7 @@ msgstr "[错误的日计数: \"%s\" ]" msgid "[Wrong value for month: \"%s\" ]" msgstr "[错误的月计数: \"%s\" ]" -#: include/classes/validators/CApiInputValidator.php:593 +#: include/classes/validators/CApiInputValidator.php:597 msgid "a boolean is expected" msgstr "预先设定的布尔值" @@ -18080,33 +18097,37 @@ msgstr "预先设定的布尔值" #: include/classes/api/services/CTriggerGeneral.php:257 #: include/classes/api/services/CUser.php:649 #: include/classes/import/validators/CXmlValidatorGeneral.php:193 -#: include/classes/validators/CApiInputValidator.php:230 +#: include/classes/validators/CApiInputValidator.php:234 #: include/classes/validators/CNewValidator.php:278 msgid "a character string is expected" msgstr "请在字符串中指定" -#: include/classes/validators/CApiInputValidator.php:271 +#: include/classes/validators/CApiInputValidator.php:275 msgid "a hexadecimal colour code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:554 -#: include/classes/validators/CApiInputValidator.php:952 +#: include/classes/validators/CApiInputValidator.php:1059 +msgid "a low-level discovery macro is expected" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:421 +#: include/classes/validators/CApiInputValidator.php:558 +#: include/classes/validators/CApiInputValidator.php:956 msgid "a number is expected" msgstr "预先设定的数字" #: app/controllers/CControllerPopupHttpStep.php:109 -#: include/classes/validators/CApiInputValidator.php:422 -#: include/classes/validators/CApiInputValidator.php:564 -#: include/classes/validators/CApiInputValidator.php:959 -#: include/classes/validators/CApiInputValidator.php:1185 +#: include/classes/validators/CApiInputValidator.php:426 +#: include/classes/validators/CApiInputValidator.php:568 +#: include/classes/validators/CApiInputValidator.php:963 +#: include/classes/validators/CApiInputValidator.php:1218 msgid "a number is too large" msgstr "数字过大" #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CItemGeneral.php:1233 -#: include/classes/api/services/CItemGeneral.php:1306 -#: include/classes/api/services/CItemGeneral.php:1316 +#: include/classes/api/services/CItemGeneral.php:1323 +#: include/classes/api/services/CItemGeneral.php:1396 +#: include/classes/api/services/CItemGeneral.php:1406 #: include/classes/api/services/CScreen.php:423 msgid "a numeric value is expected" msgstr "一个数值预计" @@ -18116,23 +18137,23 @@ msgid "a time is expected" msgstr "a 预计时间" #: app/controllers/CControllerPopupMedia.php:110 -#: include/classes/validators/CApiInputValidator.php:1093 +#: include/classes/validators/CApiInputValidator.php:1126 #: include/validate.inc.php:216 msgid "a time period is expected" msgstr "预设时间段" -#: include/classes/validators/CApiInputValidator.php:1059 +#: include/classes/validators/CApiInputValidator.php:1092 #: include/validate.inc.php:235 msgid "a time range is expected" msgstr "" #: app/controllers/CControllerPopupHttpStep.php:103 -#: include/classes/validators/CApiInputValidator.php:1174 +#: include/classes/validators/CApiInputValidator.php:1207 #: include/validate.inc.php:227 include/validate.inc.php:570 msgid "a time unit is expected" msgstr "预设时间单位" -#: include/classes/validators/CApiInputValidator.php:1026 +#: include/classes/validators/CApiInputValidator.php:1030 msgid "a user macro is expected" msgstr "预设用户宏" @@ -18175,18 +18196,18 @@ msgstr "所有介质" #: include/classes/api/services/CDRule.php:463 #: include/classes/api/services/CDRule.php:470 -#: include/classes/api/services/CItemGeneral.php:2161 -#: include/classes/api/services/CItemGeneral.php:2185 +#: include/classes/api/services/CItemGeneral.php:2124 +#: include/classes/api/services/CItemGeneral.php:2148 #: include/classes/import/validators/CXmlValidatorGeneral.php:207 -#: include/classes/validators/CApiInputValidator.php:370 -#: include/classes/validators/CApiInputValidator.php:508 -#: include/classes/validators/CApiInputValidator.php:648 -#: include/classes/validators/CApiInputValidator.php:756 -#: include/classes/validators/CApiInputValidator.php:798 +#: include/classes/validators/CApiInputValidator.php:374 +#: include/classes/validators/CApiInputValidator.php:512 +#: include/classes/validators/CApiInputValidator.php:652 +#: include/classes/validators/CApiInputValidator.php:760 +#: include/classes/validators/CApiInputValidator.php:802 msgid "an array is expected" msgstr "请在阵列中指定" -#: include/classes/validators/CApiInputValidator.php:727 +#: include/classes/validators/CApiInputValidator.php:731 msgid "an array or a character string is expected" msgstr "预设一个数组或一个字符串" @@ -18195,7 +18216,7 @@ msgstr "预设一个数组或一个字符串" msgid "an empty string is expected" msgstr "请指定一个空字符串" -#: include/classes/api/services/CHost.php:1548 +#: include/classes/api/services/CHost.php:1584 msgid "an even number of hexadecimal characters is expected" msgstr "预设会出现偶数个十六进制字符" @@ -18286,6 +18307,7 @@ msgstr "不能变更" #: include/classes/api/services/CCorrelation.php:1101 #: include/classes/api/services/CCorrelation.php:1118 #: include/classes/api/services/CCorrelation.php:1137 +#: include/classes/api/services/CDiscoveryRule.php:1423 #: include/classes/api/services/CDRule.php:203 #: include/classes/api/services/CDRule.php:209 #: include/classes/api/services/CDRule.php:319 @@ -18293,19 +18315,19 @@ msgstr "不能变更" #: include/classes/api/services/CDRule.php:357 #: include/classes/api/services/CDRule.php:512 #: include/classes/api/services/CEvent.php:847 -#: include/classes/api/services/CHost.php:1536 -#: include/classes/api/services/CHost.php:1542 +#: include/classes/api/services/CHost.php:1572 +#: include/classes/api/services/CHost.php:1578 #: include/classes/api/services/CHttpTest.php:982 #: include/classes/api/services/CItemGeneral.php:485 #: include/classes/api/services/CItemGeneral.php:512 #: include/classes/api/services/CItemGeneral.php:518 #: include/classes/api/services/CItemGeneral.php:524 -#: include/classes/api/services/CItemGeneral.php:1201 -#: include/classes/api/services/CItemGeneral.php:1223 -#: include/classes/api/services/CItemGeneral.php:1254 -#: include/classes/api/services/CItemGeneral.php:1268 -#: include/classes/api/services/CItemGeneral.php:1294 -#: include/classes/api/services/CItemGeneral.php:1465 +#: include/classes/api/services/CItemGeneral.php:1291 +#: include/classes/api/services/CItemGeneral.php:1313 +#: include/classes/api/services/CItemGeneral.php:1344 +#: include/classes/api/services/CItemGeneral.php:1358 +#: include/classes/api/services/CItemGeneral.php:1384 +#: include/classes/api/services/CItemGeneral.php:1555 #: include/classes/api/services/CMapElement.php:95 #: include/classes/api/services/CMapElement.php:114 #: include/classes/api/services/CMapElement.php:152 @@ -18326,19 +18348,19 @@ msgstr "不能变更" #: include/classes/api/services/CUserGroup.php:463 #: include/classes/api/services/CUser.php:532 #: include/classes/api/services/CUser.php:660 -#: include/classes/validators/CApiInputValidator.php:240 -#: include/classes/validators/CApiInputValidator.php:375 -#: include/classes/validators/CApiInputValidator.php:513 -#: include/classes/validators/CApiInputValidator.php:559 -#: include/classes/validators/CApiInputValidator.php:761 -#: include/classes/validators/CApiInputValidator.php:803 +#: include/classes/validators/CApiInputValidator.php:244 +#: include/classes/validators/CApiInputValidator.php:379 +#: include/classes/validators/CApiInputValidator.php:517 +#: include/classes/validators/CApiInputValidator.php:563 +#: include/classes/validators/CApiInputValidator.php:765 +#: include/classes/validators/CApiInputValidator.php:807 #: include/classes/validators/CNewValidator.php:91 #: include/classes/widgets/forms/CWidgetFormMap.php:101 usergrps.php:341 #: usergrps.php:381 usergrps.php:384 msgid "cannot be empty" msgstr "不能为空" -#: include/classes/api/services/CItemGeneral.php:2177 +#: include/classes/api/services/CItemGeneral.php:2140 msgid "cannot convert to JSON, result value too long" msgstr "" @@ -18346,6 +18368,10 @@ msgstr "" msgid "cannot perform Scroll API request, data could be truncated" msgstr "" +#: include/classes/api/services/CDiscoveryRule.php:1406 +msgid "cannot update property for templated discovery rule" +msgstr "" + #: app/controllers/CControllerPopupTriggerExpr.php:246 msgid "change() - Difference between last and previous value" msgstr "" @@ -18355,11 +18381,8 @@ msgstr "" msgid "check expression starting from \"%1$s\"" msgstr "检查表达式从\"%1$s\"开始" -#: include/classes/api/services/CHostGeneral.php:1024 -#: include/classes/api/services/CItemGeneral.php:1730 -#: include/classes/api/services/CItemGeneral.php:1736 -#: include/classes/api/services/CItemGeneral.php:1973 -#: include/classes/import/CConfigurationImport.php:2611 +#: include/classes/api/services/CItemGeneral.php:1848 +#: include/classes/import/CConfigurationImport.php:2619 msgid "circular item dependency is not allowed" msgstr "不允许循环项依赖" @@ -18438,7 +18461,7 @@ msgstr "降" msgid "diff() - Difference between last and preceding values (1 - true, 0 - false)" msgstr "" -#: include/classes/validators/CApiInputValidator.php:996 +#: include/classes/validators/CApiInputValidator.php:1000 msgid "directory or script name cannot be empty" msgstr "目录或脚本名称不能为空" @@ -18467,8 +18490,8 @@ msgid "does not equal" msgstr "" #: include/actions.inc.php:35 -#: include/views/configuration.host.discovery.edit.php:634 -#: include/views/js/configuration.host.discovery.edit.js.php:25 +#: include/views/configuration.host.discovery.edit.php:622 +#: include/views/js/configuration.host.discovery.edit.js.php:27 msgid "does not match" msgstr "" @@ -18477,7 +18500,7 @@ msgstr "" msgid "equals" msgstr "" -#: include/views/js/common.item.edit.js.php:311 +#: include/views/js/item.preprocessing.js.php:266 msgid "error message" msgstr "" @@ -18493,11 +18516,11 @@ msgstr "表达式为空" msgid "failed to parse JSON" msgstr "" -#: include/forms.inc.php:2018 include/maintenances.inc.php:111 +#: include/forms.inc.php:2266 include/maintenances.inc.php:111 msgid "first" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1276 +#: include/classes/api/services/CItemGeneral.php:1366 msgid "first parameter is expected" msgstr "第一个参数是预设的" @@ -18505,7 +18528,7 @@ msgstr "第一个参数是预设的" msgid "forecast() - Forecast for next t seconds based on period T" msgstr "" -#: include/forms.inc.php:2021 include/maintenances.inc.php:114 +#: include/forms.inc.php:2269 include/maintenances.inc.php:114 msgid "fourth" msgstr "" @@ -18513,10 +18536,10 @@ msgstr "" 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 "" -#: include/views/configuration.item.edit.php:772 -#: include/views/configuration.item.edit.php:777 -#: include/views/configuration.item.edit.php:798 -#: include/views/configuration.item.edit.php:803 +#: include/views/configuration.item.edit.php:759 +#: include/views/configuration.item.edit.php:764 +#: include/views/configuration.item.edit.php:785 +#: include/views/configuration.item.edit.php:790 msgctxt "item_form" msgid "global housekeeping settings" msgstr "全局管家设置" @@ -18556,7 +18579,7 @@ msgstr "" msgid "host pattern" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1753 +#: include/classes/api/services/CItemGeneral.php:1831 msgid "hostid of dependent item and master item should match" msgstr "依赖项目和主项目的hostid应该匹配" @@ -18599,7 +18622,7 @@ msgstr "事件源" msgid "invalid address range \"%1$s\"" msgstr "无效地址范围 \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:235 +#: include/classes/validators/CApiInputValidator.php:239 msgid "invalid byte sequence in UTF-8" msgstr "UTF-8中无效的字节排序" @@ -18614,15 +18637,15 @@ msgstr "无效延迟" msgid "invalid history storage period" msgstr "无效的历史数据期间" -#: include/classes/validators/CApiInputValidator.php:855 +#: include/classes/validators/CApiInputValidator.php:859 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:899 +#: include/classes/validators/CApiInputValidator.php:903 msgid "invalid host name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1129 +#: include/classes/validators/CApiInputValidator.php:1162 msgid "invalid regular expression" msgstr "无效的正则表达式" @@ -18644,7 +18667,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1365 +#: include/classes/validators/CApiInputValidator.php:1398 msgid "is not enclosed in {} or is malformed" msgstr "不包含在{}或格式错误" @@ -18666,7 +18689,7 @@ msgid "key is empty" msgstr "关键字为空" #: include/classes/graphdraw/CLineGraphDraw.php:1850 -#: include/classes/graphdraw/CPieGraphDraw.php:330 include/forms.inc.php:2022 +#: include/classes/graphdraw/CPieGraphDraw.php:330 include/forms.inc.php:2270 #: include/graphs.inc.php:82 include/maintenances.inc.php:115 #: include/views/js/configuration.graph.edit.js.php:52 msgid "last" @@ -18680,12 +18703,7 @@ msgstr "" msgid "left" msgstr "左" -#: include/views/configuration.item.edit.php:1002 -#: include/views/configuration.item.massupdate.php:379 -#: include/views/configuration.item.prototype.edit.php:835 -#: include/views/configuration.item.prototype.massupdate.php:356 -#: include/views/js/common.item.edit.js.php:197 -#: include/views/js/configuration.item.massupdate.js.php:154 +#: include/forms.inc.php:1463 include/views/js/item.preprocessing.js.php:146 msgid "list of characters" msgstr "字符列表" @@ -18739,20 +18757,19 @@ msgid "map" msgstr "拓扑图" #: include/actions.inc.php:34 -#: include/views/configuration.host.discovery.edit.php:633 -#: include/views/js/configuration.host.discovery.edit.js.php:24 +#: include/views/configuration.host.discovery.edit.php:621 +#: include/views/js/configuration.host.discovery.edit.js.php:26 msgid "matches" msgstr "匹配" -#: include/classes/api/services/CItemGeneral.php:1324 +#: include/classes/api/services/CItemGeneral.php:1414 #: include/classes/graphdraw/CLineGraphDraw.php:1853 #: include/classes/graphdraw/CLineGraphDraw.php:1867 -#: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:80 -#: include/views/configuration.item.edit.php:1032 -#: include/views/configuration.item.prototype.edit.php:865 -#: include/views/js/common.item.edit.js.php:237 +#: include/classes/graphdraw/CPieGraphDraw.php:326 include/forms.inc.php:1497 +#: include/graphs.inc.php:80 #: include/views/js/configuration.graph.edit.js.php:51 #: include/views/js/configuration.graph.edit.js.php:59 +#: include/views/js/item.preprocessing.js.php:192 msgid "max" msgstr "最大" @@ -18760,28 +18777,24 @@ msgstr "最大" msgid "max() - Maximum value for period T" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1851 +#: include/classes/api/services/CItemGeneral.php:1942 msgid "maximum dependent items count reached" msgstr "达到最大依赖项数" -#: include/classes/api/services/CHostGeneral.php:1031 -#: include/classes/api/services/CItemGeneral.php:1766 -#: include/classes/api/services/CItemGeneral.php:1860 -#: include/classes/api/services/CItemGeneral.php:1980 -#: include/classes/import/CConfigurationImport.php:2565 -#: include/classes/import/CConfigurationImport.php:2626 +#: include/classes/api/services/CItemGeneral.php:1928 +#: include/classes/import/CConfigurationImport.php:2573 +#: include/classes/import/CConfigurationImport.php:2634 msgid "maximum number of dependency levels reached" msgstr "达到最大数量的依赖关系" -#: include/classes/api/services/CItemGeneral.php:1324 +#: include/classes/api/services/CItemGeneral.php:1414 #: include/classes/graphdraw/CLineGraphDraw.php:1851 #: include/classes/graphdraw/CLineGraphDraw.php:1864 -#: include/classes/graphdraw/CPieGraphDraw.php:322 include/graphs.inc.php:78 -#: include/views/configuration.item.edit.php:1031 -#: include/views/configuration.item.prototype.edit.php:864 -#: include/views/js/common.item.edit.js.php:234 +#: include/classes/graphdraw/CPieGraphDraw.php:322 include/forms.inc.php:1496 +#: include/graphs.inc.php:78 #: include/views/js/configuration.graph.edit.js.php:49 #: include/views/js/configuration.graph.edit.js.php:57 +#: include/views/js/item.preprocessing.js.php:189 msgid "min" msgstr "最小" @@ -18789,7 +18802,7 @@ msgstr "最小" msgid "min() - Minimum value for period T" msgstr "" -#: include/classes/api/services/CHost.php:1554 +#: include/classes/api/services/CHost.php:1590 #, c-format msgid "minimum length is %1$s characters" msgstr "最小长度为 %1$s 个字符" @@ -18804,7 +18817,7 @@ msgctxt "millisecond short" msgid "ms" msgstr "毫秒" -#: app/views/administration.authentication.edit.php:114 +#: app/views/administration.authentication.edit.php:122 msgid "must be a valid LDAP user" msgstr "必需为一个正确的LDAP用户" @@ -18822,17 +18835,17 @@ msgstr "必需为一个正确的LDAP用户" msgid "must be between \"%1$s\" and \"%2$s\"" msgstr "必须在 \"%1$s\" 和 \"%2$s\" 之间" -#: include/classes/validators/CApiInputValidator.php:862 -#: include/classes/validators/CApiInputValidator.php:906 +#: include/classes/validators/CApiInputValidator.php:866 +#: include/classes/validators/CApiInputValidator.php:910 msgid "must contain at least one low-level discovery macro" msgstr "" -#: include/views/configuration.host.discovery.edit.php:125 -#: include/views/configuration.host.discovery.edit.php:220 -#: include/views/configuration.item.edit.php:157 -#: include/views/configuration.item.edit.php:252 -#: include/views/configuration.item.prototype.edit.php:145 -#: include/views/configuration.item.prototype.edit.php:240 +#: include/views/configuration.host.discovery.edit.php:124 +#: include/views/configuration.host.discovery.edit.php:216 +#: include/views/configuration.item.edit.php:159 +#: include/views/configuration.item.edit.php:251 +#: include/views/configuration.item.prototype.edit.php:144 +#: include/views/configuration.item.prototype.edit.php:236 #: include/views/js/configuration.httpconf.edit.js.php:13 msgid "name" msgstr "名字" @@ -18841,9 +18854,9 @@ msgstr "名字" msgid "new" msgstr "新" -#: disc_prototypes.php:1251 disc_prototypes.php:1275 hosts.php:1180 +#: disc_prototypes.php:1274 disc_prototypes.php:1298 hosts.php:1180 #: include/views/configuration.host.massupdate.php:83 -#: include/views/configuration.item.massupdate.php:591 templates.php:550 +#: include/views/configuration.item.massupdate.php:473 templates.php:550 msgctxt "new element in multiselect" msgid "new" msgstr "新" @@ -18866,8 +18879,8 @@ msgstr "" msgid "none" msgstr "" -#: include/classes/api/services/CItemGeneral.php:2168 -#: include/classes/api/services/CItemGeneral.php:2192 +#: include/classes/api/services/CItemGeneral.php:2131 +#: include/classes/api/services/CItemGeneral.php:2155 msgid "nonempty key and value pair expected" msgstr "" @@ -18878,7 +18891,7 @@ msgstr "非在" #: app/controllers/CControllerDashboardView.php:134 #: hostinventoriesoverview.php:76 #: include/classes/pagefilter/CPageFilter.php:808 -#: include/classes/pagefilter/CPageFilter.php:875 include/forms.inc.php:1134 +#: include/classes/pagefilter/CPageFilter.php:875 include/forms.inc.php:1131 #: include/views/monitoring.screen.php:63 slides.php:187 msgid "not selected" msgstr "非所选的" @@ -18887,13 +18900,7 @@ msgstr "非所选的" msgid "now() - Number of seconds since the Epoch" msgstr "" -#: include/views/configuration.item.edit.php:995 -#: include/views/configuration.item.massupdate.php:355 -#: include/views/configuration.item.prototype.edit.php:828 -#: include/views/configuration.item.prototype.massupdate.php:332 -#: include/views/js/common.item.edit.js.php:188 -#: include/views/js/configuration.item.massupdate.js.php:45 -#: include/views/js/configuration.item.massupdate.js.php:145 +#: include/forms.inc.php:1456 include/views/js/item.preprocessing.js.php:137 msgid "number" msgstr "数字" @@ -18953,35 +18960,15 @@ msgstr "于" msgid "other" msgstr "其它" -#: include/views/configuration.item.edit.php:1017 -#: include/views/configuration.item.massupdate.php:368 -#: include/views/configuration.item.prototype.edit.php:850 -#: include/views/configuration.item.prototype.massupdate.php:345 -#: include/views/js/common.item.edit.js.php:58 -#: include/views/js/common.item.edit.js.php:218 -#: include/views/js/configuration.item.massupdate.js.php:46 +#: include/forms.inc.php:1482 include/views/js/item.preprocessing.js.php:26 +#: include/views/js/item.preprocessing.js.php:173 msgid "output" msgstr "输出" -#: include/views/configuration.item.edit.php:1010 -#: include/views/configuration.item.massupdate.php:385 -#: include/views/configuration.item.prototype.edit.php:843 -#: include/views/configuration.item.prototype.massupdate.php:362 -#: include/views/js/common.item.edit.js.php:207 -#: include/views/js/configuration.item.massupdate.js.php:162 -msgid "path" -msgstr "路径" - -#: include/views/configuration.item.edit.php:1016 -#: include/views/configuration.item.edit.php:1037 -#: include/views/configuration.item.massupdate.php:390 -#: include/views/configuration.item.prototype.edit.php:849 -#: include/views/configuration.item.prototype.edit.php:870 -#: include/views/configuration.item.prototype.massupdate.php:367 -#: include/views/js/common.item.edit.js.php:55 -#: include/views/js/common.item.edit.js.php:215 -#: include/views/js/common.item.edit.js.php:244 -#: include/views/js/configuration.item.massupdate.js.php:169 +#: include/forms.inc.php:1481 include/forms.inc.php:1502 +#: include/views/js/item.preprocessing.js.php:23 +#: include/views/js/item.preprocessing.js.php:170 +#: include/views/js/item.preprocessing.js.php:199 msgid "pattern" msgstr "模式" @@ -19006,8 +18993,8 @@ msgstr "每%1$s秒刷新一次" msgid "regexp() - Regular expression V matching last value in period T (1 - match, 0 - no match)" msgstr "" -#: include/views/configuration.host.discovery.edit.php:656 -#: include/views/js/configuration.host.discovery.edit.js.php:29 +#: include/views/configuration.host.discovery.edit.php:644 +#: include/views/js/configuration.host.discovery.edit.js.php:31 msgid "regular expression" msgstr "正则表达式" @@ -19030,7 +19017,7 @@ msgstr "正确" msgid "root" msgstr "root" -#: include/classes/api/services/CItemGeneral.php:1760 +#: include/classes/api/services/CItemGeneral.php:1838 msgid "ruleid of dependent item and master item should match" msgstr "" @@ -19039,18 +19026,16 @@ msgctxt "second short" msgid "s" msgstr "s" -#: include/forms.inc.php:2019 include/maintenances.inc.php:112 +#: include/forms.inc.php:2267 include/maintenances.inc.php:112 msgctxt "adjective" msgid "second" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1282 +#: include/classes/api/services/CItemGeneral.php:1372 msgid "second parameter is expected" msgstr "预设的第二参数" -#: include/views/configuration.item.edit.php:1042 -#: include/views/configuration.item.prototype.edit.php:875 -#: include/views/js/common.item.edit.js.php:251 +#: include/forms.inc.php:1507 include/views/js/item.preprocessing.js.php:206 msgid "seconds" msgstr "" @@ -19062,19 +19047,19 @@ msgstr "选择" msgid "short description" msgstr "简要描述" -#: include/classes/api/services/CHost.php:1561 -#: include/classes/api/services/CHost.php:1567 -#: include/classes/api/services/CHost.php:1576 -#: include/classes/api/services/CHost.php:1582 +#: include/classes/api/services/CHost.php:1597 +#: include/classes/api/services/CHost.php:1603 +#: include/classes/api/services/CHost.php:1612 +#: include/classes/api/services/CHost.php:1618 #: include/classes/api/services/CHttpTest.php:967 #: include/classes/api/services/CHttpTest.php:1076 #: include/classes/api/services/CItemGeneral.php:499 #: include/classes/api/services/CItemGeneral.php:537 -#: include/classes/api/services/CItemGeneral.php:1340 -#: include/classes/api/services/CItemGeneral.php:1363 -#: include/classes/api/services/CItemGeneral.php:1427 -#: include/classes/api/services/CItemGeneral.php:1455 -#: include/classes/api/services/CItemGeneral.php:2145 +#: include/classes/api/services/CItemGeneral.php:1430 +#: include/classes/api/services/CItemGeneral.php:1453 +#: include/classes/api/services/CItemGeneral.php:1517 +#: include/classes/api/services/CItemGeneral.php:1545 +#: include/classes/api/services/CItemGeneral.php:2108 #: include/classes/api/services/CMaintenance.php:468 #: include/classes/api/services/CMaintenance.php:637 #: include/classes/api/services/CProxy.php:661 @@ -19090,10 +19075,10 @@ msgstr "可能是空的" msgid "show icon mappings" msgstr "展示图标映射" -#: include/views/configuration.item.edit.php:836 -#: include/views/configuration.item.massupdate.php:555 -#: include/views/configuration.item.prototype.edit.php:712 -#: include/views/configuration.item.prototype.massupdate.php:544 +#: include/views/configuration.item.edit.php:821 +#: include/views/configuration.item.massupdate.php:445 +#: include/views/configuration.item.prototype.edit.php:702 +#: include/views/configuration.item.prototype.massupdate.php:444 msgid "show value mappings" msgstr "展示值映射" @@ -19151,8 +19136,10 @@ msgstr "模板ID\"%1$s\"已传送%2$s次" #: app/controllers/CControllerDashboardUpdate.php:135 #: app/controllers/CControllerDashboardUpdate.php:143 #: include/classes/api/services/CDashboard.php:385 +#: include/classes/api/services/CDiscoveryRule.php:1441 +#: include/classes/api/services/CDiscoveryRule.php:1449 #: include/classes/api/services/CHttpTest.php:750 -#: include/classes/validators/CApiInputValidator.php:683 +#: include/classes/validators/CApiInputValidator.php:687 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "找不到参数 \"%1$s\"" @@ -19163,7 +19150,7 @@ msgstr "找不到参数 \"%1$s\"" msgid "the tag \"%1$s\" is missing" msgstr "标签 \"%1$s\" 丢失" -#: include/forms.inc.php:2020 include/maintenances.inc.php:113 +#: include/forms.inc.php:2268 include/maintenances.inc.php:113 msgid "third" msgstr "" @@ -19202,7 +19189,7 @@ msgstr "触发器原型以及关联项无法移动到另外一个模板或者主 msgid "type here to search" msgstr "在此输入搜索" -#: include/classes/validators/CApiInputValidator.php:1397 +#: include/classes/validators/CApiInputValidator.php:1430 msgid "unacceptible URL" msgstr "" @@ -19216,7 +19203,7 @@ msgstr "宏的结束是不正确" #: include/classes/api/services/CHttpTest.php:464 #: include/classes/api/services/CHttpTest.php:488 -#: include/classes/validators/CApiInputValidator.php:655 +#: include/classes/validators/CApiInputValidator.php:659 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "\"%1$s\" 参数异常" @@ -19236,11 +19223,11 @@ msgstr "异常的文本 \"%1$s\"" #: include/classes/api/services/CEvent.php:805 #: include/classes/api/services/CEvent.php:905 -#: include/classes/api/services/CHost.php:1516 -#: include/classes/api/services/CHost.php:1522 -#: include/classes/api/services/CItemGeneral.php:1208 -#: include/classes/api/services/CItemGeneral.php:1414 -#: include/classes/api/services/CItemGeneral.php:1440 +#: include/classes/api/services/CHost.php:1552 +#: include/classes/api/services/CHost.php:1558 +#: include/classes/api/services/CItemGeneral.php:1298 +#: include/classes/api/services/CItemGeneral.php:1504 +#: include/classes/api/services/CItemGeneral.php:1530 #: include/classes/api/services/CProxy.php:559 #: include/classes/api/services/CProxy.php:566 #: include/classes/api/services/CTriggerGeneral.php:574 @@ -19273,12 +19260,12 @@ msgstr "这个版本已经不被支持" #: include/views/administration.usergroups.edit.php:246 #: include/views/configuration.action.edit.php:370 #: include/views/configuration.correlation.edit.php:152 -#: include/views/configuration.host.discovery.edit.php:129 -#: include/views/configuration.host.discovery.edit.php:224 -#: include/views/configuration.item.edit.php:161 -#: include/views/configuration.item.edit.php:256 -#: include/views/configuration.item.prototype.edit.php:149 -#: include/views/configuration.item.prototype.edit.php:244 +#: include/views/configuration.host.discovery.edit.php:128 +#: include/views/configuration.host.discovery.edit.php:220 +#: include/views/configuration.item.edit.php:163 +#: include/views/configuration.item.edit.php:255 +#: include/views/configuration.item.prototype.edit.php:148 +#: include/views/configuration.item.prototype.edit.php:240 #: include/views/configuration.maintenance.edit.php:210 #: include/views/configuration.trigger.prototype.edit.php:500 #: include/views/configuration.trigger.prototype.massupdate.php:146 @@ -19287,55 +19274,61 @@ msgstr "这个版本已经不被支持" #: include/views/configuration.triggers.massupdate.php:129 #: include/views/hostmacros.php:85 #: include/views/js/administration.general.macros.edit.js.php:11 -#: include/views/js/common.item.edit.js.php:305 #: include/views/js/configuration.httpconf.edit.js.php:18 #: include/views/js/configuration.maintenance.edit.js.php:11 #: include/views/js/configuration.maintenance.edit.js.php:35 #: include/views/js/configuration.triggers.edit.js.php:9 #: include/views/js/configuration.triggers.list.js.php:11 #: include/views/js/hostmacros.js.php:11 +#: include/views/js/item.preprocessing.js.php:260 msgid "value" msgstr "值" +#: include/classes/api/services/CDiscoveryRule.php:1320 +#, c-format +msgid "value \"%1$s\" already exists" +msgstr "" + #: include/classes/import/CConfigurationImport.php:808 #: include/classes/import/CConfigurationImport.php:846 -#: include/classes/import/CConfigurationImport.php:2461 -#: include/classes/import/CConfigurationImport.php:2575 -#: include/classes/import/CConfigurationImport.php:2620 +#: include/classes/import/CConfigurationImport.php:2469 +#: include/classes/import/CConfigurationImport.php:2583 +#: include/classes/import/CConfigurationImport.php:2628 #, c-format msgid "value \"%1$s\" not found" msgstr "值 \"%1$s\" 未找到" -#: include/classes/validators/CApiInputValidator.php:1219 -#: include/classes/validators/CApiInputValidator.php:1273 +#: include/classes/validators/CApiInputValidator.php:1252 +#: include/classes/validators/CApiInputValidator.php:1306 #, c-format msgid "value %1$s already exists" msgstr "值 %1$s 已存在" -#: include/classes/validators/CApiInputValidator.php:338 -#: include/classes/validators/CApiInputValidator.php:846 -#: include/classes/validators/CApiInputValidator.php:889 -#: include/classes/validators/CApiInputValidator.php:941 -#: include/classes/validators/CApiInputValidator.php:986 -#: include/classes/validators/CApiInputValidator.php:1021 -#: include/classes/validators/CApiInputValidator.php:1052 -#: include/classes/validators/CApiInputValidator.php:1086 -#: include/classes/validators/CApiInputValidator.php:1120 -#: include/classes/validators/CApiInputValidator.php:1360 -#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:342 +#: include/classes/validators/CApiInputValidator.php:850 +#: include/classes/validators/CApiInputValidator.php:893 +#: include/classes/validators/CApiInputValidator.php:945 +#: include/classes/validators/CApiInputValidator.php:990 +#: include/classes/validators/CApiInputValidator.php:1025 +#: include/classes/validators/CApiInputValidator.php:1054 +#: include/classes/validators/CApiInputValidator.php:1085 +#: include/classes/validators/CApiInputValidator.php:1119 +#: include/classes/validators/CApiInputValidator.php:1153 +#: include/classes/validators/CApiInputValidator.php:1393 +#: include/classes/validators/CApiInputValidator.php:1425 msgid "value is too long" msgstr "值过长" #: include/classes/api/services/CHost.php:771 -#: include/classes/api/services/CHost.php:1678 -#: include/classes/api/services/CHost.php:1818 +#: include/classes/api/services/CHost.php:1714 +#: include/classes/api/services/CHost.php:1854 #: include/classes/api/services/CMapElement.php:75 #: include/classes/api/services/CMap.php:675 #: include/classes/api/services/CMap.php:681 #: include/classes/api/services/CMap.php:1129 #: include/classes/api/services/CMap.php:1135 -#: include/classes/validators/CApiInputValidator.php:332 -#: include/classes/validators/CApiInputValidator.php:476 +#: include/classes/validators/CApiInputValidator.php:336 +#: include/classes/validators/CApiInputValidator.php:480 #, c-format msgid "value must be one of %1$s" msgstr "值必须是 %1$s 之一" |