diff options
Diffstat (limited to 'ui/locale/zh_TW/LC_MESSAGES/frontend.po')
-rw-r--r-- | ui/locale/zh_TW/LC_MESSAGES/frontend.po | 2755 |
1 files changed, 1259 insertions, 1496 deletions
diff --git a/ui/locale/zh_TW/LC_MESSAGES/frontend.po b/ui/locale/zh_TW/LC_MESSAGES/frontend.po index 89832d97df9..10dffc25c53 100644 --- a/ui/locale/zh_TW/LC_MESSAGES/frontend.po +++ b/ui/locale/zh_TW/LC_MESSAGES/frontend.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Zabbix 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-20 10:47+0300\n" +"POT-Creation-Date: 2021-10-15 19:55+0300\n" "PO-Revision-Date: 2012-11-06 09:39+0300\n" "Last-Translator: Yaochiu <brian.huang@primillet.com>\n" "Language-Team: Zabbix <info@zabbix.com>\n" @@ -96,7 +96,7 @@ msgid "%1$d day" msgid_plural "%1$d days" msgstr[0] "%1$d 天" -#: jsLoader.php:323 +#: jsLoader.php:304 #, c-format msgctxt "screen reader" msgid "%1$d matches for %2$s found" @@ -174,7 +174,7 @@ msgstr[0] "" #: include/classes/widgets/CWidgetConfig.php:286 #: include/classes/widgets/CWidgetConfig.php:287 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631 -#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171 +#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152 #, c-format msgid "%1$s minute" msgid_plural "%1$s minutes" @@ -186,7 +186,7 @@ msgid "%1$s of %2$s element in problem state" msgid_plural "%1$s of %2$s elements in problem state" msgstr[0] "" -#: jsLoader.php:324 +#: jsLoader.php:305 #, c-format msgctxt "screen reader" msgid "%1$s preselected, use down,up arrow keys and enter to select" @@ -216,13 +216,13 @@ msgstr[0] "尚有%1$s次重試" #: app/views/administration.user.edit.php:673 #: include/classes/widgets/CWidgetConfig.php:283 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638 -#: jsLoader.php:166 jsLoader.php:167 +#: jsLoader.php:147 jsLoader.php:148 #, c-format msgid "%1$s second" msgid_plural "%1$s seconds" msgstr[0] "%1$s 秒" -#: jsLoader.php:305 +#: jsLoader.php:286 #, c-format msgid "%1$s symbols remaining" msgstr "" @@ -241,13 +241,13 @@ msgctxt "screen reader" msgid "%1$s, Severity, %2$s" msgstr "" -#: jsLoader.php:318 +#: jsLoader.php:299 #, c-format msgctxt "screen reader" msgid "%1$s, read only" msgstr "" -#: jsLoader.php:361 +#: jsLoader.php:342 #, c-format msgctxt "screen reader" msgid "%1$s, selected" @@ -375,7 +375,7 @@ msgstr "" msgid "API methods" msgstr "" -#: app/controllers/CControllerAuditLogList.php:209 +#: app/controllers/CControllerAuditLogList.php:210 msgid "API token" msgstr "" @@ -433,10 +433,6 @@ msgstr "" msgid "Abscissa" msgstr "" -#: srv_status.php:149 -msgid "Acceptable SLA" -msgstr "" - #: include/func.inc.php:1511 msgid "Access denied" msgstr "" @@ -479,7 +475,7 @@ msgstr "" msgid "Ack" msgstr "知悉" -#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328 +#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309 msgid "Acknowledge" msgstr "知悉" @@ -487,7 +483,7 @@ msgstr "知悉" msgid "Acknowledge problems" msgstr "" -#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075 +#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075 #: include/events.inc.php:196 msgid "Acknowledged" msgstr "已知悉" @@ -500,7 +496,7 @@ msgstr "已知悉問題事件" msgid "Acknowledged RESOLVED events" msgstr "" -#: app/controllers/CControllerAuditLogList.php:208 +#: app/controllers/CControllerAuditLogList.php:209 #: app/partials/administration.usergroup.tagfilters.html.php:29 #: app/partials/configuration.tags.tab.php:41 #: app/partials/configuration.valuemap.php:35 @@ -527,9 +523,9 @@ msgstr "" #: app/views/popup.massupdate.template.php:140 #: app/views/popup.massupdate.trigger.php:84 #: app/views/popup.massupdate.trigger.php:98 -#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134 -#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270 -#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47 +#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151 +#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279 +#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51 #: app/views/reports.auditlog.list.php:71 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827 @@ -586,7 +582,7 @@ msgstr "回應作業 \"%1$s\" 已存在。" msgid "Action \"%1$s\" no operations defined." msgstr "回應作業 \"%1$s\" 未定義作業" -#: include/classes/api/services/CRole.php:742 +#: include/classes/api/services/CRole.php:761 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -595,7 +591,7 @@ msgstr "" msgid "Action added" msgstr "動作已新增" -#: include/classes/core/ZBase.php:532 +#: include/classes/core/ZBase.php:497 #, c-format msgid "Action class %1$s must extend %2$s class." msgstr "" @@ -642,8 +638,8 @@ msgstr "動作已更新" #: include/classes/screens/CScreenProblem.php:1163 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28 -#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144 -#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327 +#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125 +#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308 #: tr_events.php:182 msgid "Actions" msgstr "動作" @@ -710,7 +706,7 @@ msgstr "作用中直到" #: app/views/administration.userrole.edit.php:381 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 -#: app/views/configuration.correlation.edit.php:173 +#: app/views/configuration.correlation.edit.php:175 #: app/views/configuration.dashboard.edit.php:59 #: app/views/configuration.discovery.edit.php:83 #: app/views/configuration.discovery.edit.php:146 @@ -721,7 +717,7 @@ msgstr "作用中直到" #: app/views/js/reports.scheduledreport.edit.js.php:133 #: app/views/monitoring.dashboard.view.php:135 #: app/views/monitoring.dashboard.widget.edit.php:38 -#: app/views/popup.condition.common.php:700 +#: app/views/popup.condition.common.php:699 #: app/views/popup.dashboard.share.edit.php:36 #: app/views/popup.dashboard.share.edit.php:57 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 @@ -744,9 +740,9 @@ msgstr "作用中直到" #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104 #: app/views/popup.scheduledreport.edit.php:43 #: app/views/popup.scheduledreport.subscription.php:133 -#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145 -#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294 -#: app/views/popup.service.edit.php:339 +#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158 +#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307 +#: app/views/popup.service.edit.php:385 #: app/views/popup.service.statusrule.edit.php:98 #: app/views/popup.service.time.edit.php:167 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147 @@ -816,7 +812,7 @@ msgstr "作用中直到" #: include/views/monitoring.sysmap.edit.php:304 #: include/views/monitoring.sysmap.edit.php:325 #: include/views/monitoring.sysmap.edit.php:362 -#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191 +#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172 msgid "Add" msgstr "新增" @@ -824,11 +820,11 @@ msgstr "新增" msgid "Add (message type limit reached)" msgstr "" -#: jsLoader.php:161 +#: jsLoader.php:142 msgid "Add a new widget" msgstr "" -#: jsLoader.php:192 +#: jsLoader.php:173 msgid "Add child element" msgstr "" @@ -836,7 +832,7 @@ msgstr "" msgid "Add child service" msgstr "" -#: app/views/js/popup.service.edit.js.php:302 +#: app/views/js/popup.service.edit.js.php:493 msgid "Add child services" msgstr "" @@ -853,7 +849,7 @@ msgstr "新增主機" msgid "Add missing" msgstr "" -#: jsLoader.php:193 +#: jsLoader.php:174 msgid "Add multiple maps" msgstr "" @@ -875,7 +871,7 @@ msgstr "" msgid "Add page" msgstr "" -#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392 +#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373 msgid "Add parent services" msgstr "" @@ -927,12 +923,12 @@ msgstr "" msgid "Add widget" msgstr "" -#: app/controllers/CControllerAuditLogList.php:353 +#: app/controllers/CControllerAuditLogList.php:354 #: app/controllers/CControllerPopupImportCompare.php:161 msgid "Added" msgstr "" -#: jsLoader.php:316 +#: jsLoader.php:297 #, c-format msgctxt "screen reader" msgid "Added, %1$s" @@ -942,7 +938,7 @@ msgstr "" msgid "Additional rule" msgstr "" -#: app/views/popup.service.edit.php:154 +#: app/views/popup.service.edit.php:167 msgid "Additional rules" msgstr "" @@ -955,7 +951,7 @@ msgstr "管理者" msgid "Administration" msgstr "管理" -#: app/views/popup.service.edit.php:126 +#: app/views/popup.service.edit.php:143 msgid "Advanced configuration" msgstr "" @@ -977,7 +973,7 @@ msgstr "歷時少於" msgid "Age less than %1$s" msgstr "" -#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1049,7 +1045,7 @@ msgstr "" #: app/views/reports.scheduledreport.list.php:56 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178 -#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384 +#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365 msgid "All" msgstr "所有" @@ -1067,7 +1063,7 @@ msgstr "" msgid "All hosts" msgstr "" -#: jsLoader.php:272 +#: jsLoader.php:253 msgid "All links should have \"Name\" and \"URL\" specified" msgstr "所有的連結應含 特定的名稱和URL" @@ -1085,7 +1081,7 @@ msgstr "" msgid "All problems if tag values match" msgstr "" -#: app/controllers/CControllerServiceListGeneral.php:121 +#: app/controllers/CControllerServiceListGeneral.php:145 msgid "All services" msgstr "" @@ -1198,15 +1194,15 @@ msgstr "應用集 錯誤." #: app/views/dashboard.page.properties.edit.php:64 #: app/views/dashboard.properties.edit.php:92 #: app/views/monitoring.dashboard.widget.edit.php:38 -#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47 +#: app/views/popup.maintenance.period.php:189 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298 #: include/classes/html/CTabFilter.php:96 #: include/views/js/monitoring.sysmaps.js.php:327 #: include/views/js/monitoring.sysmaps.js.php:480 #: include/views/js/monitoring.sysmaps.js.php:604 #: include/views/js/monitoring.sysmaps.js.php:709 -#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194 -#: jsLoader.php:307 +#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175 +#: jsLoader.php:288 msgid "Apply" msgstr "適用" @@ -1224,7 +1220,7 @@ msgstr "接近中" msgid "Apr" msgstr "四月" -#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224 +#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205 msgid "April" msgstr "四月" @@ -1252,7 +1248,7 @@ msgstr "區域類型" msgid "Arithmetic" msgstr "" -#: include/classes/helpers/CServiceHelper.php:146 +#: include/classes/helpers/CServiceHelper.php:148 msgid "As is" msgstr "" @@ -1299,7 +1295,7 @@ msgstr "於(時:分)" msgid "At least one UI element must be checked." msgstr "" -#: include/classes/api/services/CRole.php:471 +#: include/classes/api/services/CRole.php:487 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1308,7 +1304,7 @@ msgstr "" msgid "At least one action is mandatory." msgstr "" -#: include/classes/api/services/CUser.php:608 +#: include/classes/api/services/CUser.php:614 #: include/classes/api/services/CUser.php:1286 #, c-format msgid "At least one active user must exist with role \"%1$s\"." @@ -1320,6 +1316,11 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "" +#: include/classes/api/services/CHostGroup.php:1088 +#: include/classes/api/services/CHostGroup.php:1245 +msgid "At least one host or template must be specified." +msgstr "" + #: include/classes/api/services/CMaintenance.php:380 #: include/classes/api/services/CMaintenance.php:388 #: include/classes/api/services/CMaintenance.php:635 @@ -1331,7 +1332,7 @@ msgstr "必須創建至少一個維修期間." msgid "At least one of MySQL, PostgreSQL or Oracle should be supported." msgstr "" -#: app/views/configuration.correlation.edit.php:156 +#: app/views/configuration.correlation.edit.php:158 msgid "At least one operation must be selected." msgstr "" @@ -1387,7 +1388,7 @@ msgstr "" msgid "Aug" msgstr "八月" -#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228 +#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209 msgid "August" msgstr "八月" @@ -1400,7 +1401,7 @@ msgstr "" msgid "AuthN requests" msgstr "" -#: app/controllers/CControllerAuditLogList.php:210 +#: app/controllers/CControllerAuditLogList.php:211 #: app/views/administration.authentication.edit.php:324 #: app/views/administration.authentication.edit.php:334 #: app/views/administration.mediatype.edit.php:89 @@ -1477,7 +1478,7 @@ msgstr "" #: app/partials/popup.operations.php:228 #: app/views/administration.miscconfig.edit.php:62 #: app/views/popup.lldoperation.php:282 -#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207 +#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140 #: include/views/configuration.host.edit.php:383 #: include/views/configuration.host.prototype.edit.php:358 msgid "Automatic" @@ -1492,7 +1493,7 @@ msgstr "自動的圖示對應" msgid "Automatic icon selection" msgstr "自動的圖示選擇" -#: app/controllers/CControllerAuditLogList.php:211 +#: app/controllers/CControllerAuditLogList.php:212 #: app/controllers/CControllerAutoregEdit.php:67 #: app/views/administration.autoreg.edit.php:29 #: app/views/administration.autoreg.edit.php:89 @@ -1544,7 +1545,7 @@ msgstr "" msgid "Avoid easy-to-guess passwords" msgstr "" -#: include/classes/widgets/views/widget.svggraph.form.view.php:293 +#: include/classes/widgets/views/widget.svggraph.form.view.php:294 msgid "Axes" msgstr "" @@ -1607,7 +1608,7 @@ msgstr "" msgid "Blocked" msgstr "封鎖的" -#: include/classes/core/ZBase.php:361 +#: include/classes/core/ZBase.php:355 msgid "Blue" msgstr "" @@ -1661,11 +1662,11 @@ msgstr "" msgid "Bottom" msgstr "底部" -#: jsLoader.php:264 +#: jsLoader.php:245 msgid "Bring forward" msgstr "" -#: jsLoader.php:263 +#: jsLoader.php:244 msgid "Bring to front" msgstr "" @@ -1691,7 +1692,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:116 #: app/views/monitoring.widget.problems.view.php:109 -#: include/classes/graph/CSvgGraph.php:1080 +#: include/classes/graph/CSvgGraph.php:1086 #: include/classes/screens/CScreenProblem.php:974 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376 msgid "CLOSING" @@ -1736,8 +1737,8 @@ msgstr "" msgid "CSV to JSON" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2514 -#: include/classes/validators/CNewValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1746,7 +1747,7 @@ msgstr "" msgid "Calculated" msgstr "計算的" -#: jsLoader.php:220 +#: jsLoader.php:201 msgid "Calendar" msgstr "" @@ -1771,7 +1772,7 @@ msgstr "回呼" #: app/views/administration.usergroup.edit.php:214 #: app/views/administration.userrole.edit.php:352 #: app/views/administration.user.token.edit.php:78 -#: app/views/configuration.correlation.edit.php:167 +#: app/views/configuration.correlation.edit.php:169 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.audit.settings.edit.js.php:45 @@ -1784,8 +1785,8 @@ msgstr "回呼" #: app/views/monitoring.dashboard.view.php:143 #: app/views/popup.import.compare.php:162 #: include/classes/html/CButtonCancel.php:25 -#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195 -#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380 +#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176 +#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361 msgid "Cancel" msgstr "取消" @@ -1815,7 +1816,7 @@ msgstr "無法新增操作" msgid "Cannot add correlation" msgstr "" -#: jsLoader.php:145 +#: jsLoader.php:126 #, c-format msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added." msgstr "" @@ -1825,7 +1826,7 @@ msgstr "" msgid "Cannot add dependency from a host to a template." msgstr "無法新增自主機到模板的相依關係" -#: include/classes/api/services/CDiscoveryRule.php:889 +#: include/classes/api/services/CDiscoveryRule.php:885 #: include/triggers.inc.php:371 #, c-format msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"." @@ -1856,8 +1857,8 @@ msgid "Cannot add host prototype" msgstr "" #: app/controllers/CControllerImageCreate.php:41 -#: app/controllers/CControllerImageCreate.php:107 -#: app/controllers/CControllerImageCreate.php:131 +#: app/controllers/CControllerImageCreate.php:101 +#: app/controllers/CControllerImageCreate.php:132 msgid "Cannot add image" msgstr "無法新增圖片" @@ -1948,15 +1949,15 @@ msgstr "無法新增用户" msgid "Cannot add user group" msgstr "" -#: httpconf.php:228 +#: httpconf.php:200 msgid "Cannot add web scenario" msgstr "無法新增網頁檢測" -#: jsLoader.php:146 +#: jsLoader.php:127 msgid "Cannot add widget: not enough free space on the dashboard." msgstr "" -#: jsLoader.php:319 +#: jsLoader.php:300 msgctxt "screen reader" msgid "Cannot be removed" msgstr "" @@ -1976,33 +1977,29 @@ msgstr "" msgid "Cannot build expression tree: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:773 +#: include/classes/api/services/CRole.php:792 msgid "Cannot change the user type of own role." msgstr "" -#: httpconf.php:219 httpconf.php:493 items.php:962 +#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038 msgid "Cannot clear history" msgstr "無法清除歷史" -#: items.php:1070 -msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host" -msgstr "" - -#: include/classes/api/services/CDiscoveryRule.php:2514 +#: include/classes/api/services/CDiscoveryRule.php:2510 msgid "Cannot clone graph prototypes." msgstr "無法克隆圖形原型" -#: include/classes/api/services/CDiscoveryRule.php:2570 +#: include/classes/api/services/CDiscoveryRule.php:2566 msgid "Cannot clone host prototypes." msgstr "無法複製原型主機" -#: include/classes/api/services/CDiscoveryRule.php:2317 -#: include/classes/api/services/CDiscoveryRule.php:2373 -#: include/classes/api/services/CDiscoveryRule.php:2391 +#: include/classes/api/services/CDiscoveryRule.php:2313 +#: include/classes/api/services/CDiscoveryRule.php:2369 +#: include/classes/api/services/CDiscoveryRule.php:2387 msgid "Cannot clone item prototypes." msgstr "無法克隆項目原型" -#: include/classes/api/services/CDiscoveryRule.php:802 +#: include/classes/api/services/CDiscoveryRule.php:798 msgid "Cannot clone trigger prototypes." msgstr "無法克隆觸發器原型" @@ -2028,7 +2025,7 @@ msgid "Cannot copy graph" msgid_plural "Cannot copy graphs" msgstr[0] "" -#: items.php:1054 +#: items.php:1022 msgid "Cannot copy item" msgid_plural "Cannot copy items" msgstr[0] "" @@ -2078,8 +2075,8 @@ msgstr "無法創建圖示對應" msgid "Cannot create scheduled report" msgstr "" -#: include/classes/api/services/CService.php:1803 -#: include/classes/api/services/CService.php:1827 +#: include/classes/api/services/CService.php:2324 +#: include/classes/api/services/CService.php:2348 #, c-format msgid "Cannot create service \"%1$s\": %2$s." msgstr "" @@ -2107,7 +2104,7 @@ msgstr "無法刪除Zabbix內部用戶 \"%1$s\", 試試停用那用戶." msgid "Cannot delete action" msgstr "無法删除動作" -#: include/classes/api/services/CRole.php:357 +#: include/classes/api/services/CRole.php:375 #, c-format msgid "Cannot delete assigned user role \"%1$s\"." msgstr "" @@ -2170,7 +2167,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group." msgstr[0] "" -#: include/classes/api/services/CHostGroup.php:1598 +#: include/classes/api/services/CHostGroup.php:826 #, c-format msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." @@ -2180,11 +2177,11 @@ msgstr[0] "" msgid "Cannot delete host prototypes" msgstr "無法刪除數筆原型主機" -#: app/controllers/CControllerIconMapDelete.php:64 +#: app/controllers/CControllerIconMapDelete.php:65 msgid "Cannot delete icon map" msgstr "無法刪除圖示對應" -#: app/controllers/CControllerImageDelete.php:69 +#: app/controllers/CControllerImageDelete.php:71 msgid "Cannot delete image" msgstr "無法删除圖片" @@ -2209,7 +2206,7 @@ msgstr "無法刪除原型項目" msgid "Cannot delete item prototypes" msgstr "無法刪除數筆原型項目" -#: items.php:1126 +#: items.php:1048 msgid "Cannot delete items" msgstr "無法刪除項目" @@ -2237,7 +2234,7 @@ msgid "Cannot delete proxy" msgid_plural "Cannot delete proxies" msgstr[0] "無法刪除系統代理程式" -#: include/classes/api/services/CRole.php:351 +#: include/classes/api/services/CRole.php:369 #, c-format msgid "Cannot delete readonly user role \"%1$s\"." msgstr "" @@ -2257,7 +2254,7 @@ msgid "Cannot delete script" msgid_plural "Cannot delete scripts" msgstr[0] "無法删除脚本" -#: include/classes/api/services/CScript.php:999 +#: include/classes/api/services/CScript.php:875 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "無法刪除腳本. 腳本 \"%1$s\" 用於動作操作\"%2$s\"." @@ -2272,8 +2269,8 @@ msgid "Cannot delete service" msgid_plural "Cannot delete services" msgstr[0] "無法删除服務" -#: include/classes/api/services/CService.php:464 -#: include/classes/api/services/CService.php:479 +#: include/classes/api/services/CService.php:485 +#: include/classes/api/services/CService.php:500 #, c-format msgid "Cannot delete service \"%1$s\": %2$s." msgstr "" @@ -2302,7 +2299,7 @@ msgstr "" msgid "Cannot delete templated item." msgstr "無法刪除樣本項目." -#: include/classes/api/services/CDiscoveryRule.php:585 +#: include/classes/api/services/CDiscoveryRule.php:581 msgid "Cannot delete templated items." msgstr "無法刪除模板項目." @@ -2352,7 +2349,7 @@ msgid "Cannot delete user role" msgid_plural "Cannot delete user roles" msgstr[0] "" -#: httpconf.php:179 httpconf.php:502 +#: httpconf.php:179 httpconf.php:444 msgid "Cannot delete web scenario" msgstr "無法刪除網頁檢測" @@ -2382,7 +2379,7 @@ msgid "Cannot disable host" msgid_plural "Cannot disable hosts" msgstr[0] "無法停用主機" -#: items.php:1014 +#: items.php:982 msgid "Cannot disable item" msgid_plural "Cannot disable items" msgstr[0] "無法停用項目" @@ -2409,7 +2406,7 @@ msgid "Cannot disable trigger" msgid_plural "Cannot disable triggers" msgstr[0] "無法停用觸發器" -#: httpconf.php:446 +#: httpconf.php:418 msgid "Cannot disable web scenario" msgid_plural "Cannot disable web scenarios" msgstr[0] "無法停用網頁檢測" @@ -2450,7 +2447,7 @@ msgid "Cannot enable host" msgid_plural "Cannot enable hosts" msgstr[0] "無法啟用數筆主機" -#: items.php:1013 +#: items.php:981 msgid "Cannot enable item" msgid_plural "Cannot enable items" msgstr[0] "無法啟用項目" @@ -2477,7 +2474,7 @@ msgid "Cannot enable trigger" msgid_plural "Cannot enable triggers" msgstr[0] "無法啟用觸發器" -#: httpconf.php:445 +#: httpconf.php:417 msgid "Cannot enable web scenario" msgid_plural "Cannot enable web scenarios" msgstr[0] "無法啟用網頁檢測" @@ -2490,7 +2487,7 @@ msgstr "" msgid "Cannot execute script." msgstr "" -#: jsLoader.php:275 +#: jsLoader.php:256 msgid "Cannot expand macros." msgstr "" @@ -2524,8 +2521,8 @@ msgstr "無法找到用在拓墣圖\"%2$s\"中的主機\"%1$s\"." msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:2146 -#: include/classes/api/services/CDiscoveryRule.php:2350 +#: include/classes/api/services/CDiscoveryRule.php:2142 +#: include/classes/api/services/CDiscoveryRule.php:2346 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526 #: include/items.inc.php:701 #, c-format @@ -2623,24 +2620,20 @@ msgstr "" msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "" -#: srv_status.php:179 -msgid "Cannot format tree. Check logic structure in service links." -msgstr "" - #: include/classes/api/services/CTemplate.php:971 msgid "Cannot have empty visible template name." msgstr "範本的可見名稱不可為空白" -#: include/classes/api/services/CRole.php:574 -#: include/classes/api/services/CRole.php:591 -#: include/classes/api/services/CRole.php:647 -#: include/classes/api/services/CRole.php:664 +#: include/classes/api/services/CRole.php:590 +#: include/classes/api/services/CRole.php:607 +#: include/classes/api/services/CRole.php:666 +#: include/classes/api/services/CRole.php:683 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:553 -#: include/classes/api/services/CRole.php:626 +#: include/classes/api/services/CRole.php:569 +#: include/classes/api/services/CRole.php:645 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2652,7 +2645,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist. msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist." msgstr[0] "" -#: app/controllers/CControllerPopupTriggerExpr.php:1472 +#: app/controllers/CControllerPopupTriggerExpr.php:1479 msgid "Cannot insert trigger expression" msgstr "無法插入觸發器表示式" @@ -2666,7 +2659,7 @@ msgid "Cannot link template." msgstr "無法連結範本" #: app/controllers/CControllerModuleEdit.php:106 -#: include/classes/core/ZBase.php:700 +#: include/classes/core/ZBase.php:665 #, c-format msgid "Cannot load module at: %1$s." msgid_plural "Cannot load modules at: %1$s." @@ -2697,17 +2690,17 @@ msgstr "無法大量更新範本的可見名稱" msgid "Cannot pass duplicate template IDs for the linkage: %1$s." msgstr "" -#: include/classes/db/DB.php:929 +#: include/classes/db/DB.php:958 #, c-format msgid "Cannot perform delete statement on table \"%1$s\" without where condition." msgstr "不能完成沒有where條件的刪除(delete)陳述式於資料表 \"%1$s\" 上." -#: include/classes/db/DB.php:642 +#: include/classes/db/DB.php:671 #, c-format msgid "Cannot perform update statement on table \"%1$s\" without values." msgstr "不能完成沒有值的更新(update)陳述式於資料表 \"%1$s\" 上." -#: include/classes/db/DB.php:655 +#: include/classes/db/DB.php:684 #, c-format msgid "Cannot perform update statement on table \"%1$s\" without where condition." msgstr "不能完成沒有條件的更新(update)陳述式於資料表 \"%1$s\" 上." @@ -2734,7 +2727,7 @@ msgstr "" msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"." msgstr "無法讀取回應,請檢查跟Zabbix主機 \"%1$s\" 的連線" -#: include/classes/api/services/CUser.php:550 +#: include/classes/api/services/CUser.php:556 msgid "Cannot rename guest user." msgstr "無法重新命名訪客用戶." @@ -2753,7 +2746,7 @@ msgstr "" msgid "Cannot send command, check connection with Zabbix server \"%1$s\"." msgstr "無法傳送指令,請檢查跟Zabbix主機 \"%1$s\" 的連線" -#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146 +#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068 msgid "Cannot send request" msgstr "" @@ -2793,12 +2786,12 @@ msgstr "" msgid "Cannot set session cookie." msgstr "" -#: include/classes/api/services/CService.php:815 +#: include/classes/api/services/CService.php:1324 #, c-format msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"." msgstr "" -#: jsLoader.php:283 +#: jsLoader.php:264 msgid "Cannot support notification audio for this device." msgstr "" @@ -2816,7 +2809,7 @@ msgid "Cannot unblock user" msgid_plural "Cannot unblock users" msgstr[0] "" -#: include/classes/api/services/CHostGeneral.php:590 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear Web scenarios." msgstr "" @@ -2829,7 +2822,7 @@ msgstr "無法斷連模板" msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:271 +#: include/classes/api/services/CHostGeneral.php:301 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "" @@ -2882,11 +2875,6 @@ msgstr "" msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"." msgstr "" -#: include/classes/api/services/CImage.php:519 -#, c-format -msgid "Cannot update \"imagetype\" for image \"%1$s\"." -msgstr "" - #: app/controllers/CControllerTokenUpdate.php:47 #: app/controllers/CControllerTokenUpdate.php:122 msgid "Cannot update API token" @@ -2896,8 +2884,9 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:886 -msgid "Cannot update a discovered host group." +#: include/classes/api/services/CHostGroup.php:792 +#, c-format +msgid "Cannot update a discovered host group \"%1$s\"." msgstr "" #: include/classes/api/services/CHttpTest.php:514 @@ -2956,9 +2945,7 @@ msgstr "" msgid "Cannot update group" msgstr "無法更新群組" -#: include/classes/api/services/CHostGroup.php:1092 -#: include/classes/api/services/CHostGroup.php:1196 -#: include/classes/api/services/CHostGroup.php:1332 +#: include/classes/api/services/CHostGroup.php:1314 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -2980,13 +2967,13 @@ msgstr[0] "" msgid "Cannot update hosts" msgstr "無法更新主機" -#: app/controllers/CControllerIconMapUpdate.php:77 +#: app/controllers/CControllerIconMapUpdate.php:73 msgid "Cannot update icon map" msgstr "無法更新圖示對應" #: app/controllers/CControllerImageUpdate.php:43 -#: app/controllers/CControllerImageUpdate.php:110 -#: app/controllers/CControllerImageUpdate.php:144 +#: app/controllers/CControllerImageUpdate.php:111 +#: app/controllers/CControllerImageUpdate.php:157 msgid "Cannot update image" msgstr "無法更新圖片" @@ -3039,12 +3026,12 @@ msgstr "無法更新網路拓墣圖" msgid "Cannot update proxy" msgstr "無法更新系統代理程式" -#: include/classes/api/services/CProxy.php:629 +#: include/classes/api/services/CProxy.php:654 #, c-format msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:756 +#: include/classes/api/services/CRole.php:775 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "" @@ -3064,17 +3051,17 @@ msgstr "" msgid "Cannot update script" msgstr "無法更新脚本" -#: include/classes/api/services/CScript.php:602 -#: include/classes/api/services/CScript.php:615 -#: include/classes/api/services/CScript.php:628 +#: include/classes/api/services/CScript.php:417 +#: include/classes/api/services/CScript.php:430 +#: include/classes/api/services/CScript.php:443 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "" -#: include/classes/api/services/CService.php:1740 -#: include/classes/api/services/CService.php:1802 -#: include/classes/api/services/CService.php:1826 -#: include/classes/api/services/CService.php:1861 +#: include/classes/api/services/CService.php:2261 +#: include/classes/api/services/CService.php:2323 +#: include/classes/api/services/CService.php:2347 +#: include/classes/api/services/CService.php:2382 #, c-format msgid "Cannot update service \"%1$s\": %2$s." msgstr "" @@ -3147,7 +3134,7 @@ msgstr[0] "" msgid "Cannot update user role" msgstr "" -#: httpconf.php:224 +#: httpconf.php:196 msgid "Cannot update web scenario" msgstr "" @@ -3247,8 +3234,8 @@ msgid "Character string not included" msgstr "字元字串未包含" #: app/controllers/CControllerPopupTriggerExpr.php:721 -#: app/controllers/CControllerPopupTriggerExpr.php:907 -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:914 +#: app/controllers/CControllerPopupTriggerExpr.php:1045 msgid "Chars" msgstr "" @@ -3363,7 +3350,7 @@ msgstr "" msgid "Checks should be unique." msgstr "檢查必需是唯一的" -#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317 +#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356 msgid "Child services" msgstr "" @@ -3384,7 +3371,7 @@ msgstr "模板中的循環式引用: %1$s." msgid "Circular template linkage is not allowed." msgstr "循環式模板連結是不允許的." -#: include/classes/core/ZBase.php:526 +#: include/classes/core/ZBase.php:491 #, c-format msgid "Class %1$s not found for action %2$s." msgstr "" @@ -3405,11 +3392,11 @@ msgstr "清除歷史和趨勢" msgid "Clear when unlinking" msgstr "清除當無連結時" -#: jsLoader.php:162 +#: jsLoader.php:143 msgid "Click and drag to desired size." msgstr "" -#: jsLoader.php:306 +#: jsLoader.php:287 msgid "Click to view or edit" msgstr "" @@ -3424,7 +3411,7 @@ msgstr "Clock" #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 #: app/views/administration.userrole.edit.php:362 -#: app/views/configuration.correlation.edit.php:178 +#: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:155 #: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 @@ -3439,7 +3426,7 @@ msgstr "Clock" #: include/views/configuration.template.edit.php:237 #: include/views/configuration.trigger.prototype.edit.php:654 #: include/views/configuration.triggers.edit.php:647 -#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330 +#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311 msgid "Clone" msgstr "克隆" @@ -3450,8 +3437,8 @@ msgstr "克隆" #: include/views/js/monitoring.sysmaps.js.php:487 #: include/views/js/monitoring.sysmaps.js.php:611 #: include/views/js/monitoring.sysmaps.js.php:716 -#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206 -#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373 +#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187 +#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354 msgid "Close" msgstr "關閉" @@ -3462,13 +3449,13 @@ msgstr "關閉" msgid "Close expression constructor" msgstr "關閉表示式建構" -#: app/views/configuration.correlation.edit.php:152 -#: include/correlation.inc.php:70 +#: app/views/configuration.correlation.edit.php:154 +#: include/classes/helpers/CCorrelationHelper.php:71 msgid "Close new event" msgstr "" -#: app/views/configuration.correlation.edit.php:146 -#: include/correlation.inc.php:69 +#: app/views/configuration.correlation.edit.php:148 +#: include/classes/helpers/CCorrelationHelper.php:70 msgid "Close old events" msgstr "" @@ -3481,8 +3468,8 @@ msgid "Close problems" msgstr "" #: include/classes/html/CCollapsibleUiWidget.php:55 -#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296 -#: jsLoader.php:301 +#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277 +#: jsLoader.php:282 msgid "Collapse" msgstr "" @@ -3499,7 +3486,7 @@ msgstr "" msgid "Color" msgstr "" -#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277 +#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258 #, c-format msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)." msgstr "" @@ -3565,7 +3552,7 @@ msgstr "" msgid "Concurrent sessions" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1495 +#: app/controllers/CControllerPopupTriggerExpr.php:1502 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" @@ -3576,17 +3563,12 @@ msgstr "條件" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1273 -#, c-format -msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CDiscoveryRule.php:1813 +#: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1605 +#: include/classes/api/services/CDiscoveryRule.php:1601 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"." msgstr "" @@ -3596,17 +3578,12 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CCorrelation.php:1261 -#, c-format -msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." -msgstr "" - -#: include/classes/api/services/CDiscoveryRule.php:1812 +#: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1604 +#: include/classes/api/services/CDiscoveryRule.php:1600 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined." msgstr "" @@ -3622,7 +3599,7 @@ msgstr "條件" #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275 #: include/classes/helpers/CMenuHelper.php:221 #: include/classes/helpers/CRoleHelper.php:283 -#: include/views/inventory.host.view.php:222 jsLoader.php:329 +#: include/views/inventory.host.view.php:222 jsLoader.php:310 msgid "Configuration" msgstr "組態" @@ -3685,7 +3662,7 @@ msgstr "主機的組態" msgid "Configuration of housekeeping" msgstr "" -#: app/controllers/CControllerIconMapEdit.php:106 +#: app/controllers/CControllerIconMapEdit.php:98 #: app/controllers/CControllerIconMapList.php:75 msgid "Configuration of icon mapping" msgstr "圖示對應的組態" @@ -3792,7 +3769,7 @@ msgstr "確認文字" msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "" -#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302 +#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:771 msgid "Connect to" @@ -3885,7 +3862,7 @@ msgstr "聯絡" #: app/partials/monitoring.host.filter.php:197 #: app/partials/monitoring.problem.filter.php:178 #: app/partials/monitoring.problem.filter.php:360 -#: app/views/popup.service.edit.php:89 +#: app/views/popup.service.edit.php:95 #: include/classes/helpers/CTagFilterFieldHelper.php:69 #: include/classes/helpers/CTagFilterFieldHelper.php:124 #: include/classes/widgets/CWidgetHelper.php:491 @@ -3945,7 +3922,7 @@ msgstr "" #: include/views/monitoring.overview.items.php:88 #: include/views/monitoring.overview.triggers.php:124 #: include/views/monitoring.sysmap.list.php:39 report2.php:175 -#: srv_status.php:173 tr_events.php:207 +#: tr_events.php:207 msgid "Content controls" msgstr "" @@ -3984,8 +3961,8 @@ msgstr "座標" #: include/views/configuration.copy.elements.php:77 #: include/views/configuration.graph.list.php:238 #: include/views/configuration.item.list.php:307 -#: include/views/configuration.triggers.list.php:343 jsLoader.php:147 -#: jsLoader.php:173 jsLoader.php:269 +#: include/views/configuration.triggers.list.php:343 jsLoader.php:128 +#: jsLoader.php:154 jsLoader.php:250 msgid "Copy" msgstr "複製" @@ -3994,12 +3971,11 @@ msgstr "複製" msgid "Copy to clipboard" msgstr "" -#: app/views/configuration.correlation.edit.php:164 +#: app/views/configuration.correlation.edit.php:166 msgid "Correlation" msgstr "" -#: include/classes/api/services/CCorrelation.php:569 -#: include/classes/api/services/CCorrelation.php:765 +#: include/classes/api/services/CCorrelation.php:536 #, c-format msgid "Correlation \"%1$s\" already exists." msgstr "" @@ -4023,16 +3999,6 @@ msgid "Correlation enabled" msgid_plural "Correlations enabled" msgstr[0] "" -#: include/classes/api/services/CCorrelation.php:539 -#, c-format -msgid "Correlation is missing parameters: %1$s" -msgstr "" - -#: include/classes/api/services/CCorrelation.php:548 -#: include/classes/api/services/CCorrelation.php:734 -msgid "Correlation name cannot be empty." -msgstr "" - #: include/events.inc.php:228 msgid "Correlation rule" msgstr "" @@ -4041,14 +4007,10 @@ msgstr "" msgid "Correlation updated" msgstr "" -#: include/classes/api/services/CImage.php:341 -msgid "Could not save image!" -msgstr "不能儲存圖片!" - #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 -#: app/controllers/CControllerPopupTriggerExpr.php:850 -#: app/controllers/CControllerPopupTriggerExpr.php:881 +#: app/controllers/CControllerPopupTriggerExpr.php:857 +#: app/controllers/CControllerPopupTriggerExpr.php:888 msgid "Count" msgstr "計數" @@ -4112,11 +4074,11 @@ msgstr "" msgid "Create dashboard" msgstr "" -#: jsLoader.php:334 +#: jsLoader.php:315 msgid "Create dependent discovery rule" msgstr "" -#: jsLoader.php:333 +#: jsLoader.php:314 msgid "Create dependent item" msgstr "" @@ -4233,7 +4195,7 @@ msgstr "創建拓墣圖" msgid "Create media type" msgstr "創建示警媒介類型" -#: app/views/popup.import.php:130 jsLoader.php:331 +#: app/views/popup.import.php:130 jsLoader.php:312 msgid "Create new" msgstr "" @@ -4257,7 +4219,7 @@ msgstr "" msgid "Create template" msgstr "創建模板" -#: include/views/configuration.triggers.list.php:149 jsLoader.php:332 +#: include/views/configuration.triggers.list.php:149 jsLoader.php:313 msgid "Create trigger" msgstr "創建觸發器" @@ -4420,7 +4382,7 @@ msgstr "DNS" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:111 -#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297 +#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230 #: include/views/inventory.host.view.php:79 msgid "DNS name" msgstr "DNS名稱" @@ -4432,11 +4394,11 @@ msgstr "DNS名稱" msgid "Daily" msgstr "每日" -#: include/classes/core/ZBase.php:362 +#: include/classes/core/ZBase.php:356 msgid "Dark" msgstr "" -#: app/controllers/CControllerAuditLogList.php:213 +#: app/controllers/CControllerAuditLogList.php:214 #: app/controllers/CControllerDashboardPrint.php:71 #: app/controllers/CControllerDashboardView.php:138 #: app/partials/scheduledreport.formgrid.html.php:83 @@ -4457,8 +4419,8 @@ msgstr "" msgid "Dashboard \"%1$s\" is used in report \"%2$s\"." msgstr "" -#: app/controllers/CControllerDashboardUpdate.php:141 -#: app/controllers/CControllerTemplateDashboardUpdate.php:135 +#: app/controllers/CControllerDashboardUpdate.php:145 +#: app/controllers/CControllerTemplateDashboardUpdate.php:139 msgid "Dashboard created" msgstr "" @@ -4480,9 +4442,9 @@ msgstr "" msgid "Dashboard sharing" msgstr "" -#: app/controllers/CControllerDashboardShareUpdate.php:89 -#: app/controllers/CControllerDashboardUpdate.php:136 -#: app/controllers/CControllerTemplateDashboardUpdate.php:130 +#: app/controllers/CControllerDashboardShareUpdate.php:94 +#: app/controllers/CControllerDashboardUpdate.php:140 +#: app/controllers/CControllerTemplateDashboardUpdate.php:134 msgid "Dashboard updated" msgstr "" @@ -4506,7 +4468,7 @@ msgstr "" #: include/html.inc.php:371 include/views/configuration.template.list.php:121 #: include/views/configuration.template.list.php:233 #: include/views/inventory.host.view.php:168 -#: include/views/inventory.host.view.php:172 jsLoader.php:335 +#: include/views/inventory.host.view.php:172 jsLoader.php:316 msgid "Dashboards" msgstr "" @@ -4534,7 +4496,7 @@ msgstr "資料概覽" #: include/classes/widgets/CWidgetHelper.php:1154 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34 -#: include/classes/widgets/views/widget.svggraph.form.view.php:290 +#: include/classes/widgets/views/widget.svggraph.form.view.php:291 msgid "Data set" msgstr "" @@ -4676,7 +4638,7 @@ msgstr "週中第幾日" msgid "Days" msgstr "日數" -#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364 +#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345 msgid "Debug" msgstr "調試" @@ -4690,26 +4652,26 @@ msgstr "調試模式" msgid "Dec" msgstr "十二" -#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232 +#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213 msgid "December" msgstr "十二" -#: app/controllers/CControllerPopupTriggerExpr.php:894 -#: app/controllers/CControllerPopupTriggerExpr.php:1051 +#: app/controllers/CControllerPopupTriggerExpr.php:901 +#: app/controllers/CControllerPopupTriggerExpr.php:1058 msgid "Decimal places" msgstr "" -#: include/classes/helpers/CServiceHelper.php:148 +#: include/classes/helpers/CServiceHelper.php:150 msgid "Decrease by" msgstr "" #: app/views/administration.iconmap.edit.php:108 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31 -#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232 +#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232 #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:145 #: include/views/js/monitoring.sysmaps.js.php:263 -#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258 +#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239 msgid "Default" msgstr "預設" @@ -4802,7 +4764,7 @@ msgstr "延遲因" #: app/views/administration.userrole.list.php:127 #: app/views/administration.user.token.edit.php:92 #: app/views/administration.user.token.list.php:153 -#: app/views/configuration.correlation.edit.php:179 +#: app/views/configuration.correlation.edit.php:181 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 @@ -4826,8 +4788,8 @@ msgstr "延遲因" #: include/views/configuration.template.list.php:283 #: include/views/configuration.trigger.prototype.list.php:207 #: include/views/configuration.triggers.list.php:350 -#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148 -#: jsLoader.php:174 jsLoader.php:336 +#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129 +#: jsLoader.php:155 jsLoader.php:317 msgid "Delete" msgstr "删除" @@ -4852,11 +4814,11 @@ msgstr "刪除並清除模板? (警告: 所有連結的主機將被清除!)" msgid "Delete current action?" msgstr "刪除目前的動作?" -#: app/views/configuration.correlation.edit.php:183 +#: app/views/configuration.correlation.edit.php:185 msgid "Delete current correlation?" msgstr "" -#: jsLoader.php:337 +#: jsLoader.php:318 msgid "Delete dashboard?" msgstr "" @@ -4900,7 +4862,7 @@ msgstr "" msgid "Delete item?" msgstr "刪除項目?" -#: jsLoader.php:274 +#: jsLoader.php:255 msgid "Delete links between selected elements?" msgstr "刪除所選組件間的連結?" @@ -4956,7 +4918,7 @@ msgstr "" msgid "Delete selected discovery rules?" msgstr "删除所選的探索規則?" -#: jsLoader.php:261 +#: jsLoader.php:242 msgid "Delete selected elements?" msgstr "刪除所選的組件?" @@ -5061,7 +5023,7 @@ msgstr "" msgid "Delete selected services?" msgstr "" -#: jsLoader.php:262 +#: jsLoader.php:243 msgid "Delete selected shapes?" msgstr "" @@ -5105,7 +5067,7 @@ msgstr "刪除觸發器?" msgid "Delete web scenario?" msgstr "" -#: app/controllers/CControllerAuditLogList.php:356 +#: app/controllers/CControllerAuditLogList.php:357 msgid "Deleted" msgstr "" @@ -5150,7 +5112,7 @@ msgstr "" msgid "Dependencies" msgstr "相依關係" -#: include/triggers.inc.php:2395 +#: include/triggers.inc.php:2396 msgid "Dependent" msgstr "相依" @@ -5158,7 +5120,7 @@ msgstr "相依" msgid "Dependent item" msgstr "" -#: app/views/popup.generic.php:303 include/triggers.inc.php:2395 +#: app/views/popup.generic.php:303 include/triggers.inc.php:2396 #: include/views/configuration.trigger.prototype.list.php:92 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5168,7 +5130,7 @@ msgstr "相依於" msgid "Deployment status" msgstr "佈署狀態" -#: app/controllers/CControllerAuditLogList.php:284 +#: app/controllers/CControllerAuditLogList.php:285 #: app/partials/hostmacros.list.html.php:37 #: app/partials/massupdate.macros.tab.php:29 #: app/partials/scheduledreport.formgrid.html.php:195 @@ -5201,7 +5163,7 @@ msgid "Description" msgstr "描述" #: app/views/administration.mediatype.list.php:82 -#: app/views/js/reports.auditlog.list.js.php:148 +#: app/views/js/reports.auditlog.list.js.php:152 #: app/views/reports.auditlog.list.php:97 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175 @@ -5367,10 +5329,10 @@ msgstr "停用選取的網頁檢測?" #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 -#: include/hosts.inc.php:1205 include/html.inc.php:288 +#: include/hosts.inc.php:1138 include/html.inc.php:288 #: include/httptest.inc.php:48 include/items.inc.php:138 #: include/items.inc.php:141 include/items.inc.php:185 -#: include/maps.inc.php:325 include/triggers.inc.php:1868 +#: include/maps.inc.php:325 include/triggers.inc.php:1869 #: include/users.inc.php:84 include/views/configuration.action.list.php:77 #: include/views/configuration.action.list.php:129 #: include/views/configuration.host.discovery.list.php:167 @@ -5453,7 +5415,7 @@ msgid "Discovery by proxy" msgstr "由系統代理程式探索" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:421 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:420 include/actions.inc.php:53 msgid "Discovery check" msgstr "探索檢查" @@ -5465,7 +5427,7 @@ msgstr "探索檢查" msgid "Discovery list" msgstr "探索清單" -#: app/views/popup.condition.common.php:439 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:438 include/actions.inc.php:54 msgid "Discovery object" msgstr "探索物件" @@ -5497,7 +5459,7 @@ msgstr "" msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON" msgstr "" -#: app/controllers/CControllerAuditLogList.php:214 +#: app/controllers/CControllerAuditLogList.php:215 #: app/views/configuration.discovery.edit.php:137 #: app/views/monitoring.discovery.view.php:50 #: app/views/monitoring.widget.discovery.view.php:32 @@ -5505,12 +5467,12 @@ msgstr "" msgid "Discovery rule" msgstr "探索規則" -#: include/classes/api/services/CDiscoveryRule.php:64 +#: include/classes/api/services/CDiscoveryRule.php:60 #, 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:65 +#: include/classes/api/services/CDiscoveryRule.php:61 #, c-format msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"." msgstr "" @@ -5523,7 +5485,7 @@ msgstr "" msgid "Discovery rule \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:2165 +#: include/classes/api/services/CDiscoveryRule.php:2161 #, c-format msgid "Discovery rule \"%1$s\" cannot be copied without its master item." msgstr "" @@ -5562,7 +5524,7 @@ msgstr "探索規則已更新" #: app/controllers/CControllerPopupImportCompare.php:169 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36 #: include/html.inc.php:386 #: include/views/configuration.host.discovery.edit.php:27 #: include/views/configuration.host.discovery.list.php:29 @@ -5573,7 +5535,7 @@ msgstr "探索規則" msgid "Discovery rules deleted" msgstr "探索規則已删除" -#: app/views/popup.condition.common.php:489 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:488 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "探索狀態" @@ -5610,10 +5572,11 @@ msgid "Display stacked graph" msgstr "顯示重疊圖表" #: app/controllers/CControllerHintboxActionlist.php:93 -#: app/views/administration.queue.details.php:85 app/views/search.php:184 +#: app/views/administration.queue.details.php:85 +#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184 #: app/views/search.php:268 app/views/search.php:367 #: include/actions.inc.php:1724 include/actions.inc.php:1796 -#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376 +#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357 #, c-format msgid "Displaying %1$s of %2$s found" msgstr "顯示 已探索的 %2$s中的%1$s" @@ -5623,7 +5586,7 @@ msgstr "顯示 已探索的 %2$s中的%1$s" msgid "Displaying %1$s to %2$s of %3$s found" msgstr "" -#: include/classes/widgets/views/widget.svggraph.form.view.php:291 +#: include/classes/widgets/views/widget.svggraph.form.view.php:292 msgid "Displaying options" msgstr "" @@ -5645,7 +5608,7 @@ msgstr "" msgid "Do not keep trends" msgstr "" -#: jsLoader.php:214 jsLoader.php:338 +#: jsLoader.php:195 jsLoader.php:319 msgid "Do you wish to replace the conditional expression?" msgstr "您想要替換條件式表示式嗎?" @@ -5701,7 +5664,7 @@ msgctxt "discovery status" msgid "Down" msgstr "下" -#: jsLoader.php:188 jsLoader.php:202 +#: jsLoader.php:169 jsLoader.php:183 msgid "Download image" msgstr "" @@ -5709,7 +5672,7 @@ msgstr "" msgid "Download the configuration file" msgstr "" -#: app/partials/service.time.row.php:34 +#: app/views/js/popup.service.edit.js.php:227 #: app/views/popup.service.time.edit.php:47 #: include/classes/screens/CScreenDiscovery.php:120 msgid "Downtime" @@ -5728,18 +5691,6 @@ msgstr "" msgid "Draw style" msgstr "繪圖風格" -#: include/classes/api/services/CCorrelation.php:1176 -#: include/classes/api/services/CCorrelation.php:1328 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:556 -#: include/classes/api/services/CCorrelation.php:749 -#, c-format -msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation." -msgstr "" - #: include/classes/api/services/CMap.php:614 #: include/classes/api/services/CMap.php:1076 #, c-format @@ -5752,11 +5703,6 @@ msgstr "" msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1191 -#, c-format -msgid "Duplicate conditions for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CTrigger.php:1142 #, c-format msgid "Duplicate dependencies in trigger \"%1$s\"." @@ -5808,7 +5754,7 @@ msgstr "動態監控項" msgid "Dynamic items" msgstr "" -#: jsLoader.php:273 +#: jsLoader.php:254 msgid "Each URL should have a unique name. Please make sure there is only one URL named" msgstr "每個URL必須是唯一的. 請確保僅有一個URL為名." @@ -5817,11 +5763,11 @@ msgid "Each item" msgstr "" #: app/partials/monitoring.service.list.edit.php:127 -#: app/partials/service.statusrule.row.php:38 -#: app/partials/service.time.row.php:59 #: app/views/administration.user.edit.php:357 #: app/views/js/administration.mediatype.edit.js.php:50 #: app/views/js/configuration.discovery.edit.js.php:33 +#: app/views/js/popup.service.edit.js.php:191 +#: app/views/js/popup.service.edit.js.php:215 #: app/views/monitoring.service.list.edit.php:145 #: app/views/monitoring.service.list.php:114 #: include/views/configuration.action.edit.php:249 @@ -5835,8 +5781,8 @@ msgstr "" #: include/views/configuration.triggers.edit.php:350 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118 #: include/views/js/monitoring.sysmaps.js.php:836 -#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175 -#: jsLoader.php:196 +#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156 +#: jsLoader.php:177 msgid "Edit" msgstr "編輯" @@ -5852,11 +5798,11 @@ msgstr "" msgid "Edit operation" msgstr "" -#: jsLoader.php:197 +#: jsLoader.php:178 msgid "Edit tree element" msgstr "" -#: jsLoader.php:339 +#: jsLoader.php:320 msgid "Edit trigger" msgstr "編輯觸發器" @@ -5916,21 +5862,17 @@ msgstr "" msgid "Empty color." msgstr "" -#: include/classes/api/services/CCorrelation.php:706 -msgid "Empty correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1840 +#: include/classes/api/services/CDiscoveryRule.php:1836 #, c-format msgid "Empty filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1832 +#: include/classes/api/services/CDiscoveryRule.php:1828 #, c-format msgid "Empty filter condition macro for discovery rule \"%1$s\"." msgstr "" @@ -5946,25 +5888,19 @@ msgid "Empty filter condition type for action \"%1$s\"." msgstr "" #: include/classes/api/services/CAction.php:2705 -#: include/classes/api/services/CCorrelation.php:523 -#: include/classes/api/services/CCorrelation.php:700 #: include/classes/api/services/CDRule.php:194 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:164 +#: include/classes/api/services/CHostGeneral.php:184 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 #: include/classes/api/services/CHost.php:1319 #: include/classes/api/services/CHost.php:1850 #: include/classes/api/services/CHost.php:2075 #: include/classes/api/services/CHostPrototype.php:1109 -#: include/classes/api/services/CImage.php:448 -#: include/classes/api/services/CImage.php:501 #: include/classes/api/services/CMaintenance.php:542 #: include/classes/api/services/CMap.php:563 #: include/classes/api/services/CMap.php:589 #: include/classes/api/services/CMap.php:1034 -#: include/classes/api/services/CMediatype.php:182 -#: include/classes/api/services/CMediatype.php:448 #: include/classes/api/services/CTemplate.php:707 #: include/classes/api/services/CTrigger.php:798 msgid "Empty input parameter." @@ -5974,14 +5910,6 @@ msgstr "空的輸入參數." msgid "Empty map ID." msgstr "" -#: include/classes/api/services/CMediatype.php:454 -msgid "Empty media type ID." -msgstr "" - -#: include/classes/api/services/CImage.php:360 -msgid "Empty parameters" -msgstr "空參數" - #: app/views/administration.mediatype.list.php:167 #: app/views/administration.module.list.php:123 #: app/views/administration.token.list.php:200 @@ -6147,7 +6075,7 @@ msgstr "" #: app/views/administration.user.token.list.php:60 #: app/views/administration.user.token.list.php:126 #: app/views/administration.user.token.view.php:55 -#: app/views/configuration.correlation.edit.php:157 +#: app/views/configuration.correlation.edit.php:159 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 @@ -6158,7 +6086,7 @@ msgstr "" #: include/html.inc.php:284 include/httptest.inc.php:47 #: include/items.inc.php:138 include/items.inc.php:141 #: include/items.inc.php:182 include/triggers.inc.php:999 -#: include/triggers.inc.php:1865 +#: include/triggers.inc.php:1866 #: include/views/configuration.action.edit.php:147 #: include/views/configuration.action.list.php:76 #: include/views/configuration.action.list.php:137 @@ -6201,7 +6129,7 @@ msgid "English (en_US)" msgstr "英語(en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:757 +#: include/classes/api/services/CHostGroup.php:772 #: include/classes/api/services/CHostPrototype.php:344 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 @@ -6217,7 +6145,7 @@ msgstr "" #: app/partials/monitoring.host.filter.php:196 #: app/partials/monitoring.problem.filter.php:177 #: app/partials/monitoring.problem.filter.php:359 -#: app/views/popup.service.edit.php:88 +#: app/views/popup.service.edit.php:94 #: include/classes/helpers/CTagFilterFieldHelper.php:68 #: include/classes/helpers/CTagFilterFieldHelper.php:123 #: include/classes/widgets/CWidgetHelper.php:490 @@ -6236,12 +6164,12 @@ msgstr "" msgid "Error" msgstr "錯誤" -#: include/db.inc.php:509 +#: include/db.inc.php:518 #, c-format msgid "Error in search request for table \"%1$s\"." msgstr "資料表搜尋請求 \"%1$s\"的錯誤." -#: include/func.inc.php:1642 jsLoader.php:216 +#: include/func.inc.php:1642 jsLoader.php:197 msgid "Error message" msgstr "" @@ -6268,7 +6196,7 @@ msgstr "事件ID" msgid "Event acknowledged" msgstr "事件已知悉" -#: app/controllers/CControllerAuditLogList.php:212 +#: app/controllers/CControllerAuditLogList.php:213 #: app/views/configuration.correlation.list.php:31 #: include/classes/helpers/CMenuHelper.php:207 #: include/classes/helpers/CRoleHelper.php:368 @@ -6276,7 +6204,7 @@ msgid "Event correlation" msgstr "" #: app/controllers/CControllerCorrelationEdit.php:114 -#: app/controllers/CControllerCorrelationList.php:130 +#: app/controllers/CControllerCorrelationList.php:128 #: app/views/configuration.correlation.edit.php:31 msgid "Event correlation rules" msgstr "" @@ -6311,11 +6239,11 @@ msgstr "" msgid "Event name" msgstr "" -#: include/correlation.inc.php:52 +#: include/classes/helpers/CCorrelationHelper.php:55 msgid "Event tag pair" msgstr "" -#: app/views/popup.condition.common.php:615 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:614 include/actions.inc.php:63 msgid "Event type" msgstr "" @@ -6359,15 +6287,10 @@ msgstr "除外" msgid "Exclude host groups" msgstr "" -#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207 +#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188 msgid "Execute" msgstr "執行" -#: include/classes/api/services/CImage.php:224 -#, c-format -msgid "Execute SQL error [%1$s] in [%2$s]." -msgstr "執行SQL錯誤[%1$s]於[%2$s]." - #: include/classes/items/CHelpItems.php:409 msgid "Execute WMI query and return the JSON document with all selected objects" msgstr "" @@ -6405,7 +6328,7 @@ msgstr "" msgid "Executed script" msgstr "已執行的腳本" -#: jsLoader.php:208 +#: jsLoader.php:189 msgid "Execution confirmation" msgstr "執行確認" @@ -6421,8 +6344,8 @@ msgid "Exists" msgstr "" #: include/classes/html/CCollapsibleUiWidget.php:60 -#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297 -#: jsLoader.php:300 +#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278 +#: jsLoader.php:281 msgid "Expand" msgstr "" @@ -6543,7 +6466,7 @@ msgstr "表示式" msgid "External check" msgstr "外在檢查" -#: jsLoader.php:244 +#: jsLoader.php:225 msgctxt "Friday short" msgid "F" msgstr "F" @@ -6570,8 +6493,8 @@ msgstr "已失敗" msgid "Failed login" msgstr "" -#: app/controllers/CControllerDashboardUpdate.php:142 -#: app/controllers/CControllerTemplateDashboardUpdate.php:136 +#: app/controllers/CControllerDashboardUpdate.php:146 +#: app/controllers/CControllerTemplateDashboardUpdate.php:140 #: app/views/js/configuration.dashboard.edit.js.php:155 #: app/views/js/monitoring.dashboard.view.js.php:219 msgid "Failed to create dashboard" @@ -6582,26 +6505,26 @@ msgstr "" msgid "Failed to parse URL." msgstr "" -#: jsLoader.php:149 +#: jsLoader.php:130 msgid "Failed to paste dashboard page." msgstr "" -#: jsLoader.php:150 +#: jsLoader.php:131 msgid "Failed to paste widget." msgstr "" -#: app/controllers/CControllerDashboardUpdate.php:137 -#: app/controllers/CControllerTemplateDashboardUpdate.php:131 +#: app/controllers/CControllerDashboardUpdate.php:141 +#: app/controllers/CControllerTemplateDashboardUpdate.php:135 #: app/views/js/configuration.dashboard.edit.js.php:156 #: app/views/js/monitoring.dashboard.view.js.php:220 msgid "Failed to update dashboard" msgstr "" -#: jsLoader.php:151 +#: jsLoader.php:132 msgid "Failed to update dashboard page properties." msgstr "" -#: jsLoader.php:152 +#: jsLoader.php:133 msgid "Failed to update dashboard properties." msgstr "" @@ -6609,7 +6532,7 @@ msgstr "" msgid "Failed to update template." msgstr "" -#: jsLoader.php:153 +#: jsLoader.php:134 msgid "Failed to update widget properties." msgstr "" @@ -6633,7 +6556,7 @@ msgstr "" msgid "Feb" msgstr "二月" -#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222 +#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203 msgid "February" msgstr "二月" @@ -6655,10 +6578,9 @@ msgstr "" #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 #: include/classes/api/services/CDRule.php:538 -#: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 -#: include/classes/validators/CNewValidator.php:262 +#: include/classes/validators/CNewValidator.php:86 #: include/validate.inc.php:286 #, c-format msgid "Field \"%1$s\" is mandatory." @@ -6669,13 +6591,6 @@ msgstr "" msgid "Field \"%1$s\" is missing a value for map \"%2$s\"." msgstr "" -#: include/classes/api/services/CMediatype.php:204 -#: include/classes/api/services/CMediatype.php:546 -#: include/classes/api/services/CMediatype.php:1205 -#, c-format -msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"." -msgstr "" - #: include/validate.inc.php:175 include/validate.inc.php:183 #: include/validate.inc.php:189 include/validate.inc.php:193 #: include/validate.inc.php:213 include/validate.inc.php:221 @@ -6694,11 +6609,6 @@ msgstr "" msgid "Field \"%1$s\" is not string." msgstr "" -#: include/classes/api/services/CMediatype.php:1199 -#, c-format -msgid "Field \"%1$s\" is required for media type \"%2$s\"." -msgstr "" - #: include/validate.inc.php:298 #, c-format msgid "Field \"%1$s\" must be missing." @@ -6713,10 +6623,6 @@ msgstr "" msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256" msgstr "" -#: include/classes/api/services/CImage.php:570 -msgid "File format is unsupported." -msgstr "" - #: include/classes/import/readers/CYamlImportReader.php:52 msgid "File is empty" msgstr "" @@ -6781,7 +6687,8 @@ msgstr "填滿的區域" #: app/views/monitoring.latest.view.php:54 #: app/views/monitoring.service.list.edit.php:72 #: app/views/monitoring.service.list.php:68 -#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85 +#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328 +#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85 #: app/views/reports.scheduledreport.list.php:48 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394 #: include/classes/widgets/forms/CWidgetFormMap.php:56 @@ -6806,7 +6713,7 @@ msgstr "過濾" msgid "Filter properties" msgstr "" -#: app/controllers/CControllerServiceListGeneral.php:157 +#: app/controllers/CControllerServiceListGeneral.php:181 msgid "Filter results" msgstr "" @@ -6858,7 +6765,7 @@ msgstr "調整至符合拓墣圖" msgid "Fixed" msgstr "固定的" -#: include/classes/helpers/CServiceHelper.php:150 +#: include/classes/helpers/CServiceHelper.php:152 msgid "Fixed status" msgstr "" @@ -6909,12 +6816,12 @@ msgstr "公式" msgid "Formula missing for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1810 +#: include/classes/api/services/CDiscoveryRule.php:1806 #, c-format msgid "Formula missing for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1601 +#: include/classes/api/services/CDiscoveryRule.php:1597 #, c-format msgid "Formula missing for override \"%1$s\"." msgstr "" @@ -6927,7 +6834,7 @@ msgstr "法語 (fr_FR)" msgid "Fri" msgstr "週五" -#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237 +#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218 msgid "Friday" msgstr "週五" @@ -7038,7 +6945,7 @@ msgstr "" msgid "Given expression is not a macro" msgstr "此表示式不是巨集" -#: include/classes/api/services/CIconMap.php:359 +#: include/classes/api/services/CIconMap.php:366 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "" @@ -7052,7 +6959,7 @@ msgstr "" msgid "Go back to %1$s" msgstr "" -#: jsLoader.php:344 +#: jsLoader.php:325 msgid "Go to" msgstr "到" @@ -7090,7 +6997,7 @@ msgstr "" msgid "Go to previous page, %1$s" msgstr "" -#: include/httptest.inc.php:410 +#: include/httptest.inc.php:414 msgid "Google Chrome" msgstr "Google Chrome" @@ -7098,7 +7005,7 @@ msgstr "Google Chrome" msgid "Gradient line" msgstr "漸層線" -#: app/controllers/CControllerAuditLogList.php:215 +#: app/controllers/CControllerAuditLogList.php:216 #: app/partials/monitoring.latest.view.html.php:154 #: app/views/monitoring.charts.view.php:56 #: include/classes/macros/CMacrosResolverGeneral.php:1044 @@ -7157,7 +7064,7 @@ msgstr[0] "" msgid "Graph deleted" msgstr "圖形已删除" -#: app/controllers/CControllerAuditLogList.php:216 +#: app/controllers/CControllerAuditLogList.php:217 #: app/views/popup.lldoperation.php:53 #: include/classes/widgets/CWidgetConfig.php:52 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32 @@ -7194,8 +7101,8 @@ msgstr "" msgid "Graph prototype updated" msgstr "" -#: include/classes/api/services/CDashboardGeneral.php:485 -#: include/classes/api/services/CDashboardGeneral.php:495 +#: include/classes/api/services/CDashboardGeneral.php:525 +#: include/classes/api/services/CDashboardGeneral.php:535 #, c-format msgid "Graph prototype with ID \"%1$s\" is not available." msgstr "" @@ -7229,8 +7136,8 @@ msgstr "圖形類別" msgid "Graph updated" msgstr "圖形已更新" -#: include/classes/api/services/CDashboardGeneral.php:457 -#: include/classes/api/services/CDashboardGeneral.php:464 +#: include/classes/api/services/CDashboardGeneral.php:497 +#: include/classes/api/services/CDashboardGeneral.php:504 #, c-format msgid "Graph with ID \"%1$s\" is not available." msgstr "" @@ -7261,7 +7168,7 @@ msgstr "名為\"%1$s\"的圖形已經存在於圖形或圖形原型中." #: include/views/inventory.host.view.php:158 #: include/views/inventory.host.view.php:166 #: include/views/inventory.host.view.php:194 -#: include/views/inventory.host.view.php:217 jsLoader.php:345 +#: include/views/inventory.host.view.php:217 jsLoader.php:326 msgid "Graphs" msgstr "圖形" @@ -7282,12 +7189,12 @@ msgstr "網格" msgid "Group" msgstr "群組" -#: include/classes/api/services/CHostGroup.php:809 +#: include/classes/api/services/CHostGroup.php:650 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:853 +#: include/classes/api/services/CHostGroup.php:700 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -7461,11 +7368,11 @@ msgstr "說明" msgid "Hexadecimal to decimal" msgstr "" -#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251 +#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232 msgid "Hidden" msgstr "隱藏的" -#: jsLoader.php:365 +#: jsLoader.php:346 msgid "Hide debug" msgstr "" @@ -7492,11 +7399,11 @@ msgstr "" msgid "High" msgstr "嚴重" -#: include/classes/core/ZBase.php:364 +#: include/classes/core/ZBase.php:358 msgid "High-contrast dark" msgstr "" -#: include/classes/core/ZBase.php:363 +#: include/classes/core/ZBase.php:357 msgid "High-contrast light" msgstr "" @@ -7517,7 +7424,7 @@ msgstr "" #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89 #: include/views/configuration.item.prototype.list.php:62 items.php:261 -#: jsLoader.php:346 +#: jsLoader.php:327 msgid "History" msgstr "歷史記錄" @@ -7525,11 +7432,15 @@ msgstr "歷史記錄" msgid "History and trends compression" msgstr "" -#: items.php:959 items.php:1067 +#: include/classes/api/services/CHistory.php:353 msgid "History cleanup is not supported if compression is enabled" msgstr "" -#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116 +#: app/controllers/CControllerAuditLogList.php:198 +msgid "History clear" +msgstr "" + +#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038 msgid "History cleared" msgstr "歷史已清除" @@ -7572,7 +7483,7 @@ msgstr "横向" msgid "Horizontal align" msgstr "横向對齊" -#: app/controllers/CControllerAuditLogList.php:217 +#: app/controllers/CControllerAuditLogList.php:218 #: app/partials/monitoring.latest.view.html.php:40 #: app/partials/popup.operations.php:175 #: app/views/administration.queue.details.php:47 @@ -7601,7 +7512,7 @@ msgstr "横向對齊" #: include/views/inventory.host.view.php:214 #: include/views/js/monitoring.sysmaps.js.php:92 #: include/views/js/monitoring.sysmaps.js.php:161 -#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347 +#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328 #: report2.php:507 #, fuzzy msgid "Host" @@ -7615,7 +7526,7 @@ msgstr[0] "主機" msgid "Host \"%1$s\" already exists." msgstr "主機 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:1561 +#: include/classes/api/services/CHostGroup.php:1347 #: include/classes/api/services/CHost.php:958 #: include/classes/api/services/CHost.php:1897 #: include/classes/api/services/CHost.php:2130 @@ -7623,7 +7534,7 @@ msgstr "主機 \"%1$s\" 已存在." msgid "Host \"%1$s\" cannot be without host group." msgstr "" -#: include/classes/api/services/CProxy.php:430 +#: include/classes/api/services/CProxy.php:448 #, c-format msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"." msgstr "" @@ -7673,7 +7584,7 @@ msgid "Host enabled" msgid_plural "Hosts enabled" msgstr[0] "" -#: app/controllers/CControllerAuditLogList.php:218 +#: app/controllers/CControllerAuditLogList.php:219 #: app/partials/administration.usergroup.grouprights.html.php:29 #: app/partials/administration.usergroup.tagfilters.html.php:29 #: app/partials/popup.operations.php:183 @@ -7687,22 +7598,22 @@ msgstr[0] "" #: include/views/configuration.hostgroups.edit.php:51 #: include/views/js/monitoring.sysmaps.js.php:95 #: include/views/js/monitoring.sysmaps.js.php:102 -#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256 +#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237 #: report2.php:398 msgid "Host group" msgstr "主機群組" -#: include/classes/api/services/CHostGroup.php:707 +#: include/classes/api/services/CHostGroup.php:743 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "主機群組 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:838 +#: include/classes/api/services/CHostGroup.php:686 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:795 +#: include/classes/api/services/CHostGroup.php:636 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "" @@ -7715,10 +7626,10 @@ msgstr "主機群組組件" msgid "Host group label type" msgstr "主機群組標示類型" -#: include/classes/api/services/CDashboardGeneral.php:515 -#: include/classes/api/services/CScript.php:937 -#: include/classes/api/services/CSettings.php:236 -#: include/classes/api/services/CUserGroup.php:455 +#: include/classes/api/services/CDashboardGeneral.php:555 +#: include/classes/api/services/CScript.php:812 +#: include/classes/api/services/CSettings.php:242 +#: include/classes/api/services/CUserGroup.php:444 #, c-format msgid "Host group with ID \"%1$s\" is not available." msgstr "" @@ -7734,8 +7645,8 @@ msgstr "" #: app/partials/popup.operations.php:199 #: app/views/monitoring.latest.view.php:56 #: app/views/monitoring.web.view.php:51 -#: app/views/popup.condition.common.php:102 -#: app/views/popup.condition.common.php:283 +#: app/views/popup.condition.common.php:101 +#: app/views/popup.condition.common.php:282 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 @@ -7809,7 +7720,7 @@ msgstr "主機名稱" msgid "Host networks" msgstr "主機網路" -#: app/controllers/CControllerAuditLogList.php:219 +#: app/controllers/CControllerAuditLogList.php:220 #: app/views/popup.lldoperation.php:54 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168 msgid "Host prototype" @@ -7888,7 +7799,7 @@ msgstr "主機更新失敗." msgid "Host updated" msgstr "主機已更新" -#: include/classes/api/services/CDashboardGeneral.php:532 +#: include/classes/api/services/CDashboardGeneral.php:572 #, c-format msgid "Host with ID \"%1$s\" is not available." msgstr "" @@ -7908,7 +7819,7 @@ msgstr "" msgid "Host with the same visible name \"%1$s\" already exists." msgstr "" -#: app/controllers/CControllerHostView.php:122 +#: app/controllers/CControllerHostView.php:123 #: app/controllers/CControllerPopupGeneric.php:123 #: app/controllers/CControllerPopupGeneric.php:147 #: app/partials/common.filter.item.php:46 @@ -7921,7 +7832,7 @@ msgstr "" #: app/views/monitoring.host.view.php:39 #: app/views/monitoring.latest.view.php:73 #: app/views/monitoring.web.view.php:70 -#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30 +#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214 #: include/classes/helpers/CMenuHelper.php:44 #: include/classes/helpers/CMenuHelper.php:96 @@ -7969,7 +7880,7 @@ msgstr "主機已更新" msgid "Hours" msgstr "時" -#: app/controllers/CControllerAuditLogList.php:220 +#: app/controllers/CControllerAuditLogList.php:221 #: app/views/administration.housekeeping.edit.php:29 #: app/views/administration.housekeeping.edit.php:184 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884 @@ -8009,7 +7920,7 @@ msgstr "IP地址" #: app/views/administration.proxy.edit.php:50 #: app/views/configuration.discovery.edit.php:100 #: app/views/configuration.discovery.edit.php:112 -#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292 +#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79 msgid "IP address" msgstr "IP地址" @@ -8034,7 +7945,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:30 #: app/views/popup.massupdate.host.php:292 #: include/classes/widgets/views/widget.hostavail.form.view.php:49 -#: include/hosts.inc.php:471 include/hosts.inc.php:1273 +#: include/hosts.inc.php:471 include/hosts.inc.php:1206 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337 #: include/views/configuration.host.prototype.edit.php:325 #: include/views/js/configuration.host.edit.js.php:178 @@ -8091,12 +8002,12 @@ msgstr "圖示標記" msgid "Icon map" msgstr "圖示對應" -#: include/classes/api/services/CIconMap.php:318 +#: include/classes/api/services/CIconMap.php:323 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CIconMap.php:540 +#: include/classes/api/services/CIconMap.php:563 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "圖示對應\"%1$s\"無法被刪除. 已用於對應\"%2$s\"中." @@ -8109,18 +8020,18 @@ msgstr "圖示對應已創建" msgid "Icon map deleted" msgstr "圖示對應已刪除" -#: app/controllers/CControllerIconMapUpdate.php:65 +#: app/controllers/CControllerIconMapUpdate.php:60 msgid "Icon map updated" msgstr "圖示對應已更新" -#: app/controllers/CControllerAuditLogList.php:221 +#: app/controllers/CControllerAuditLogList.php:222 #: app/views/administration.iconmap.edit.php:29 #: app/views/administration.iconmap.list.php:27 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887 msgid "Icon mapping" msgstr "圖示對應" -#: include/classes/api/services/CIconMap.php:400 +#: include/classes/api/services/CIconMap.php:409 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "" @@ -8219,23 +8130,20 @@ msgstr "假如您認為這個訊息是錯的, 請諮詢您的管理者關於如 msgid "Iframe sandboxing exceptions" msgstr "" -#: include/classes/helpers/CServiceHelper.php:149 +#: include/classes/helpers/CServiceHelper.php:151 msgid "Ignore this service" msgstr "" -#: app/controllers/CControllerAuditLogList.php:222 +#: app/controllers/CControllerAuditLogList.php:223 #: app/views/administration.image.edit.php:60 #: app/views/administration.image.edit.php:66 image.php:26 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96 -#: jsLoader.php:257 +#: jsLoader.php:238 msgid "Image" msgstr "圖片" -#: include/classes/api/services/CImage.php:468 -#: include/classes/api/services/CImage.php:481 -#: include/classes/api/services/CImage.php:526 -#: include/classes/api/services/CImage.php:544 +#: include/classes/api/services/CImage.php:501 #, c-format msgid "Image \"%1$s\" already exists." msgstr "" @@ -8244,7 +8152,7 @@ msgstr "" msgid "Image added" msgstr "圖片已新增" -#: app/controllers/CControllerImageDelete.php:62 +#: app/controllers/CControllerImageDelete.php:63 msgid "Image deleted" msgstr "圖片已删除" @@ -8252,18 +8160,12 @@ msgstr "圖片已删除" msgid "Image label type" msgstr "圖片標示類型" -#: include/classes/api/services/CImage.php:228 -#, c-format -msgid "Image load error [%1$s] in [%2$s]." -msgstr "" - -#: include/classes/api/services/CImage.php:561 #: include/classes/helpers/CUploadFile.php:129 #, c-format msgid "Image size must be less than %1$s." msgstr "" -#: app/controllers/CControllerImageUpdate.php:135 +#: app/controllers/CControllerImageUpdate.php:147 msgid "Image updated" msgstr "圖片已更新" @@ -8358,7 +8260,7 @@ msgstr "" #: app/partials/monitoring.host.view.html.php:89 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021 #: include/views/configuration.host.list.php:217 #: include/views/inventory.host.view.php:40 msgid "Inaccessible maintenance" @@ -8369,13 +8271,13 @@ msgstr "" msgid "Inaccessible map" msgstr "" -#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661 -#: include/httptest.inc.php:218 include/items.inc.php:916 -#: include/triggers.inc.php:2159 +#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 +#: include/httptest.inc.php:222 include/items.inc.php:916 +#: include/triggers.inc.php:2160 msgid "Inaccessible template" msgstr "" -#: include/triggers.inc.php:2365 include/triggers.inc.php:2373 +#: include/triggers.inc.php:2366 include/triggers.inc.php:2374 msgid "Inaccessible trigger" msgstr "" @@ -8419,7 +8321,7 @@ msgstr "" msgid "Incoming traffic statistics on network interface. Returns integer" msgstr "" -#: include/classes/api/services/CService.php:853 +#: include/classes/api/services/CService.php:1362 #, c-format msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"." msgstr "" @@ -8587,24 +8489,6 @@ msgstr "不正確的動作操作用戶群組. 用戶群組不存在或您沒有 msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "不正確的動作操作用戶. 用戶不存在或您沒有存取權." -#: include/classes/api/services/CCorrelation.php:531 -#: include/classes/api/services/CCorrelation.php:545 -#: include/classes/api/services/CCorrelation.php:622 -#: include/classes/api/services/CCorrelation.php:731 -#: include/classes/api/services/CCorrelation.php:828 -#: include/classes/api/services/CCorrelation.php:1012 -#: include/classes/api/services/CCorrelation.php:1026 -#: include/classes/api/services/CCorrelation.php:1047 -#: include/classes/api/services/CCorrelation.php:1061 -#: include/classes/api/services/CCorrelation.php:1081 -#: include/classes/api/services/CCorrelation.php:1102 -#: include/classes/api/services/CCorrelation.php:1119 -#: include/classes/api/services/CCorrelation.php:1139 -#: include/classes/api/services/CCorrelation.php:1151 -#: include/classes/api/services/CCorrelation.php:1212 -#: include/classes/api/services/CCorrelation.php:1246 -#: include/classes/api/services/CCorrelation.php:1296 -#: include/classes/api/services/CCorrelation.php:1311 #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 @@ -8659,8 +8543,6 @@ msgstr "不正確的動作操作用戶. 用戶不存在或您沒有存取權." #: include/classes/api/services/CMap.php:1167 #: include/classes/api/services/CMap.php:1240 #: include/classes/api/services/CMap.php:1460 -#: include/classes/api/services/CMediatype.php:189 -#: include/classes/api/services/CMediatype.php:485 msgid "Incorrect arguments passed to function." msgstr "不正確的自變數傳給方程式" @@ -8686,31 +8568,22 @@ msgstr "" msgid "Incorrect conditions for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1805 +#: include/classes/api/services/CDiscoveryRule.php:1801 #, c-format msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:707 -msgid "Incorrect correlation ID." -msgstr "" - #: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CCorrelation.php:1217 -#, c-format -msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." -msgstr "" - -#: include/classes/api/services/CDiscoveryRule.php:1811 +#: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1602 +#: include/classes/api/services/CDiscoveryRule.php:1598 #, c-format msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s." msgstr "" @@ -8739,7 +8612,7 @@ msgstr "" msgid "Incorrect eventsource value." msgstr "" -#: include/classes/db/DB.php:662 include/classes/db/DB.php:936 +#: include/classes/db/DB.php:691 include/classes/db/DB.php:965 #, c-format msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"." msgstr "不正確的欄位名稱\"%1$s\"或用於資料表\"%2$s\"的where陳述式的值." @@ -8764,22 +8637,17 @@ msgstr "不正確的檔案上傳." msgid "Incorrect filter condition formula ID for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1841 +#: include/classes/api/services/CDiscoveryRule.php:1837 #, c-format msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:1250 -#, c-format -msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CDiscoveryRule.php:1833 +#: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1637 +#: include/classes/api/services/CDiscoveryRule.php:1633 #, c-format msgid "Incorrect filter condition macro for override \"%1$s\"." msgstr "" @@ -8790,7 +8658,7 @@ msgstr "" msgid "Incorrect filter condition operator for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1847 +#: include/classes/api/services/CDiscoveryRule.php:1843 #, c-format msgid "Incorrect filter condition operator for discovery rule \"%1$s\"." msgstr "" @@ -8818,8 +8686,6 @@ msgstr "不正確的圖片索引" #: include/classes/api/services/CHost.php:964 #: include/classes/api/services/CHost.php:1879 #: include/classes/api/services/CHost.php:2116 -#: include/classes/api/services/CImage.php:460 -#: include/classes/api/services/CImage.php:506 #: include/classes/api/services/CTemplate.php:497 #: include/classes/api/services/CTemplate.php:674 #: include/classes/api/services/CTrigger.php:803 @@ -8881,10 +8747,6 @@ msgstr "不正確的維修期間(至少要5分鐘)" msgid "Incorrect map ID." msgstr "" -#: include/classes/api/services/CMediatype.php:455 -msgid "Incorrect media type ID." -msgstr "" - #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 #: include/classes/api/services/CUser.php:1637 @@ -8942,13 +8804,13 @@ msgstr "" msgid "Incorrect response received from Zabbix server \"%1$s\"." msgstr "" -#: app/controllers/CControllerServiceTimeValidate.php:62 -#: app/controllers/CControllerServiceTimeValidate.php:83 +#: app/controllers/CControllerServiceTimeValidate.php:66 +#: app/controllers/CControllerServiceTimeValidate.php:87 msgid "Incorrect service end time." msgstr "不正確的服務終止時間." -#: app/controllers/CControllerServiceTimeValidate.php:53 -#: app/controllers/CControllerServiceTimeValidate.php:75 +#: app/controllers/CControllerServiceTimeValidate.php:57 +#: app/controllers/CControllerServiceTimeValidate.php:79 msgid "Incorrect service start time." msgstr "不正確的服務開始時間." @@ -9001,12 +8863,7 @@ msgstr "" msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CCorrelation.php:628 -#, c-format -msgid "Incorrect type of calculation for correlation \"%1$s\"." -msgstr "" - -#: include/classes/api/services/CDiscoveryRule.php:1798 +#: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." msgstr "" @@ -9052,13 +8909,13 @@ msgstr "" #: include/classes/api/services/CDRule.php:605 #: include/classes/api/services/CItemGeneral.php:525 #: include/classes/api/services/CItemGeneral.php:2585 -#: include/classes/validators/CNewValidator.php:122 -#: include/classes/validators/CNewValidator.php:135 +#: include/classes/validators/CNewValidator.php:124 +#: include/classes/validators/CNewValidator.php:136 #: include/classes/validators/CNewValidator.php:148 -#: include/classes/validators/CNewValidator.php:164 -#: include/classes/validators/CNewValidator.php:178 -#: include/classes/validators/CNewValidator.php:198 -#: include/classes/validators/CNewValidator.php:249 +#: include/classes/validators/CNewValidator.php:160 +#: include/classes/validators/CNewValidator.php:172 +#: include/classes/validators/CNewValidator.php:184 +#: include/classes/validators/CNewValidator.php:223 #: include/validate.inc.php:347 #, c-format msgid "Incorrect value \"%1$s\" for \"%2$s\" field." @@ -9075,60 +8932,30 @@ msgstr "" msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s." msgstr "" -#: include/classes/db/DB.php:410 +#: include/classes/db/DB.php:413 #, c-format msgid "Incorrect value \"%1$s\" for float field \"%2$s\"." msgstr "不正確的值\"%1$s\"於浮點欄位\"%2$s\"中." -#: include/classes/db/DB.php:404 +#: include/classes/db/DB.php:406 #, c-format msgid "Incorrect value \"%1$s\" for int field \"%2$s\"." msgstr "不正確的值\"%1$s\"於整數欄位\"%2$s\"中." #: include/classes/api/services/CMaintenance.php:400 #: include/classes/api/services/CMaintenance.php:668 -#: include/classes/db/DB.php:398 +#: include/classes/db/DB.php:399 #, c-format msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "不正確的值\"%1$s\"於無正負整數欄位\"%2$s\"中." -#: include/classes/api/services/CCorrelation.php:613 -#: include/classes/api/services/CCorrelation.php:633 -#: include/classes/api/services/CCorrelation.php:818 -#: include/classes/api/services/CCorrelation.php:839 -#: include/classes/api/services/CCorrelation.php:1030 -#: include/classes/api/services/CCorrelation.php:1066 -#: include/classes/api/services/CCorrelation.php:1163 -#: include/classes/api/services/CCorrelation.php:1316 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." -msgstr "" - -#: include/classes/api/services/CMediatype.php:245 -#: include/classes/api/services/CMediatype.php:256 -#: include/classes/api/services/CMediatype.php:275 -#: include/classes/api/services/CMediatype.php:291 -#: include/classes/api/services/CMediatype.php:307 -#: include/classes/api/services/CMediatype.php:326 -#: include/classes/api/services/CMediatype.php:366 -#: include/classes/api/services/CMediatype.php:566 -#: include/classes/api/services/CMediatype.php:579 -#: include/classes/api/services/CMediatype.php:598 -#: include/classes/api/services/CMediatype.php:615 -#: include/classes/api/services/CMediatype.php:632 -#: include/classes/api/services/CMediatype.php:652 -#: include/classes/api/services/CMediatype.php:692 -#: include/classes/api/services/CMediatype.php:1181 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"." -msgstr "" - -#: include/classes/validators/CNewValidator.php:123 -#: include/classes/validators/CNewValidator.php:136 +#: include/classes/validators/CNewValidator.php:125 +#: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 -#: include/classes/validators/CNewValidator.php:165 -#: include/classes/validators/CNewValidator.php:199 -#: include/classes/validators/CNewValidator.php:250 +#: include/classes/validators/CNewValidator.php:161 +#: include/classes/validators/CNewValidator.php:173 +#: include/classes/validators/CNewValidator.php:185 +#: include/classes/validators/CNewValidator.php:224 #: include/validate.inc.php:350 #, c-format msgid "Incorrect value for \"%1$s\" field." @@ -9183,14 +9010,8 @@ msgstr "" #: include/classes/api/services/CAction.php:1862 #: include/classes/api/services/CAction.php:2856 #: include/classes/api/services/CConfiguration.php:167 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 -#: include/classes/api/services/CDiscoveryRule.php:1869 -#: include/classes/api/services/CDiscoveryRule.php:2283 +#: include/classes/api/services/CDiscoveryRule.php:1865 +#: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 #: include/classes/api/services/CDRule.php:221 @@ -9300,25 +9121,7 @@ msgstr "" #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CMediatype.php:377 -#: include/classes/api/services/CMediatype.php:387 -#: include/classes/api/services/CMediatype.php:396 -#: include/classes/api/services/CMediatype.php:403 -#: include/classes/api/services/CMediatype.php:412 -#: include/classes/api/services/CMediatype.php:421 -#: include/classes/api/services/CMediatype.php:427 -#: include/classes/api/services/CMediatype.php:489 -#: include/classes/api/services/CMediatype.php:704 -#: include/classes/api/services/CMediatype.php:714 -#: include/classes/api/services/CMediatype.php:721 -#: include/classes/api/services/CMediatype.php:730 -#: include/classes/api/services/CMediatype.php:737 -#: include/classes/api/services/CMediatype.php:747 -#: include/classes/api/services/CMediatype.php:756 -#: include/classes/api/services/CMediatype.php:762 -#: include/classes/api/services/CMediatype.php:793 -#: include/classes/api/services/CMediatype.php:800 -#: include/classes/api/services/CSettings.php:274 +#: include/classes/api/services/CSettings.php:280 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 #: include/classes/api/services/CTriggerGeneral.php:156 @@ -9329,7 +9132,7 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:820 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/api/services/CUser.php:759 #: include/classes/api/services/CUser.php:2121 #: include/classes/graphdraw/CLineGraphDraw.php:115 @@ -9375,16 +9178,17 @@ msgstr "" #: include/classes/validators/CEventCorrCondValidator.php:87 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CEventCorrCondValidator.php:96 -#: include/classes/validators/CNewValidator.php:97 -#: include/classes/validators/CNewValidator.php:107 -#: include/classes/validators/CNewValidator.php:214 -#: include/classes/validators/CNewValidator.php:230 -#: include/classes/validators/CNewValidator.php:273 -#: include/classes/validators/CNewValidator.php:285 -#: include/classes/validators/CNewValidator.php:299 -#: include/classes/validators/CNewValidator.php:312 -#: include/classes/validators/CNewValidator.php:326 -#: include/classes/validators/CNewValidator.php:338 +#: include/classes/validators/CNewValidator.php:103 +#: include/classes/validators/CNewValidator.php:113 +#: include/classes/validators/CNewValidator.php:195 +#: include/classes/validators/CNewValidator.php:207 +#: include/classes/validators/CNewValidator.php:238 +#: include/classes/validators/CNewValidator.php:252 +#: include/classes/validators/CNewValidator.php:269 +#: include/classes/validators/CNewValidator.php:278 +#: include/classes/validators/CNewValidator.php:290 +#: include/classes/validators/CNewValidator.php:300 +#: include/classes/validators/CNewValidator.php:310 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124 #: include/items.inc.php:2078 include/sounds.inc.php:113 @@ -9393,7 +9197,7 @@ msgstr "" msgid "Incorrect value for field \"%1$s\": %2$s." msgstr "" -#: include/classes/helpers/CServiceHelper.php:147 +#: include/classes/helpers/CServiceHelper.php:149 msgid "Increase by" msgstr "" @@ -9481,12 +9285,12 @@ msgstr "" msgid "Inherited items" msgstr "" -#: app/views/popup.triggerexpr.php:238 +#: app/views/popup.triggerexpr.php:239 msgid "Insert" msgstr "插入" #: include/views/configuration.trigger.prototype.edit.php:136 -#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340 +#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321 msgid "Insert expression" msgstr "" @@ -9590,7 +9394,7 @@ msgstr "" msgid "Internal problem recovery" msgstr "" -#: include/httptest.inc.php:399 +#: include/httptest.inc.php:403 msgid "Internet Explorer" msgstr "IE瀏覽器" @@ -9598,7 +9402,7 @@ msgstr "IE瀏覽器" #: app/views/configuration.discovery.list.php:79 #: app/views/popup.lldoperation.php:115 #: app/views/popup.massupdate.item.php:226 -#: app/views/popup.service.edit.php:219 include/forms.inc.php:565 +#: app/views/popup.service.edit.php:232 include/forms.inc.php:565 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.host.discovery.list.php:199 #: include/views/configuration.httpconf.list.php:136 @@ -9609,7 +9413,7 @@ msgstr "IE瀏覽器" msgid "Interval" msgstr "間隔" -#: include/classes/api/services/CRole.php:719 +#: include/classes/api/services/CRole.php:738 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9632,7 +9436,7 @@ msgstr "" msgid "Invalid action condition: %1$s." msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1462 +#: app/controllers/CControllerPopupTriggerExpr.php:1469 #, c-format msgid "Invalid condition: %1$s." msgstr "" @@ -9664,7 +9468,7 @@ msgstr "" msgid "Invalid interval \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:66 +#: include/classes/api/services/CDiscoveryRule.php:62 #, c-format msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s." msgstr "" @@ -9689,27 +9493,29 @@ msgstr "" msgid "Invalid method parameters." msgstr "無效的方法參數." -#: app/controllers/CControllerDashboardUpdate.php:187 -#: app/controllers/CControllerDashboardUpdate.php:196 -#: app/controllers/CControllerDashboardUpdate.php:208 +#: app/controllers/CControllerDashboardUpdate.php:191 +#: app/controllers/CControllerDashboardUpdate.php:200 +#: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CAutoregistration.php:160 -#: include/classes/api/services/CDiscoveryRule.php:1649 -#: include/classes/api/services/CDiscoveryRule.php:1669 -#: include/classes/api/services/CDiscoveryRule.php:1682 -#: include/classes/api/services/CDiscoveryRule.php:1701 -#: include/classes/api/services/CDiscoveryRule.php:1712 -#: include/classes/api/services/CDiscoveryRule.php:1724 -#: include/classes/api/services/CDiscoveryRule.php:1732 -#: include/classes/api/services/CDiscoveryRule.php:1743 -#: include/classes/api/services/CDiscoveryRule.php:1755 -#: include/classes/api/services/CDiscoveryRule.php:1889 -#: include/classes/api/services/CDiscoveryRule.php:1975 -#: include/classes/api/services/CDiscoveryRule.php:1992 -#: include/classes/api/services/CDiscoveryRule.php:2010 -#: include/classes/api/services/CDiscoveryRule.php:2018 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CAutoregistration.php:170 +#: include/classes/api/services/CCorrelation.php:723 +#: include/classes/api/services/CCorrelation.php:729 +#: include/classes/api/services/CDiscoveryRule.php:1645 +#: include/classes/api/services/CDiscoveryRule.php:1665 +#: include/classes/api/services/CDiscoveryRule.php:1678 +#: include/classes/api/services/CDiscoveryRule.php:1697 +#: include/classes/api/services/CDiscoveryRule.php:1708 +#: include/classes/api/services/CDiscoveryRule.php:1720 +#: include/classes/api/services/CDiscoveryRule.php:1728 +#: include/classes/api/services/CDiscoveryRule.php:1739 +#: include/classes/api/services/CDiscoveryRule.php:1751 +#: include/classes/api/services/CDiscoveryRule.php:1885 +#: include/classes/api/services/CDiscoveryRule.php:1971 +#: include/classes/api/services/CDiscoveryRule.php:1988 +#: include/classes/api/services/CDiscoveryRule.php:2006 +#: include/classes/api/services/CDiscoveryRule.php:2014 #: include/classes/api/services/CGraphGeneral.php:626 #: include/classes/api/services/CGraphGeneral.php:749 #: include/classes/api/services/CHostBase.php:522 @@ -9735,17 +9541,17 @@ msgstr "無效的方法參數." #: include/classes/api/services/CItemGeneral.php:2607 #: include/classes/api/services/CItemGeneral.php:2617 #: include/classes/api/services/CItemGeneral.php:2646 -#: include/classes/api/services/CProxy.php:651 #: include/classes/api/services/CProxy.php:676 -#: include/classes/api/services/CProxy.php:682 -#: include/classes/api/services/CProxy.php:693 -#: include/classes/api/services/CProxy.php:699 -#: include/classes/api/services/CProxy.php:737 -#: include/classes/api/services/CProxy.php:754 -#: include/classes/api/services/CProxy.php:767 -#: include/classes/api/services/CProxy.php:773 -#: include/classes/api/services/CProxy.php:782 -#: include/classes/api/services/CProxy.php:794 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:707 +#: include/classes/api/services/CProxy.php:718 +#: include/classes/api/services/CProxy.php:724 +#: include/classes/api/services/CProxy.php:762 +#: include/classes/api/services/CProxy.php:779 +#: include/classes/api/services/CProxy.php:792 +#: include/classes/api/services/CProxy.php:798 +#: include/classes/api/services/CProxy.php:807 +#: include/classes/api/services/CProxy.php:819 #: include/classes/api/services/CReport.php:194 #: include/classes/api/services/CReport.php:200 #: include/classes/api/services/CReport.php:206 @@ -9753,8 +9559,8 @@ msgstr "無效的方法參數." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:1025 -#: include/classes/api/services/CScript.php:1031 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 @@ -9768,106 +9574,116 @@ msgstr "無效的方法參數." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:318 -#: include/classes/validators/CApiInputValidator.php:323 -#: include/classes/validators/CApiInputValidator.php:328 -#: include/classes/validators/CApiInputValidator.php:355 -#: include/classes/validators/CApiInputValidator.php:368 -#: include/classes/validators/CApiInputValidator.php:379 -#: include/classes/validators/CApiInputValidator.php:409 -#: include/classes/validators/CApiInputValidator.php:517 -#: include/classes/validators/CApiInputValidator.php:523 -#: include/classes/validators/CApiInputValidator.php:555 -#: include/classes/validators/CApiInputValidator.php:560 -#: include/classes/validators/CApiInputValidator.php:602 -#: include/classes/validators/CApiInputValidator.php:607 -#: include/classes/validators/CApiInputValidator.php:641 -#: include/classes/validators/CApiInputValidator.php:646 -#: include/classes/validators/CApiInputValidator.php:687 -#: include/classes/validators/CApiInputValidator.php:692 -#: include/classes/validators/CApiInputValidator.php:747 -#: include/classes/validators/CApiInputValidator.php:785 -#: include/classes/validators/CApiInputValidator.php:790 -#: include/classes/validators/CApiInputValidator.php:846 -#: include/classes/validators/CApiInputValidator.php:871 -#: include/classes/validators/CApiInputValidator.php:904 -#: include/classes/validators/CApiInputValidator.php:909 -#: include/classes/validators/CApiInputValidator.php:950 -#: include/classes/validators/CApiInputValidator.php:955 -#: include/classes/validators/CApiInputValidator.php:960 -#: include/classes/validators/CApiInputValidator.php:996 -#: include/classes/validators/CApiInputValidator.php:1052 -#: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1090 -#: include/classes/validators/CApiInputValidator.php:1135 -#: include/classes/validators/CApiInputValidator.php:1162 -#: include/classes/validators/CApiInputValidator.php:1167 -#: include/classes/validators/CApiInputValidator.php:1174 -#: include/classes/validators/CApiInputValidator.php:1205 +#: include/classes/validators/CApiInputValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:343 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:388 +#: include/classes/validators/CApiInputValidator.php:399 +#: include/classes/validators/CApiInputValidator.php:429 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:462 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:491 +#: include/classes/validators/CApiInputValidator.php:574 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:698 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:804 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:928 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1053 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1117 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1137 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1223 #: include/classes/validators/CApiInputValidator.php:1250 #: include/classes/validators/CApiInputValidator.php:1255 -#: include/classes/validators/CApiInputValidator.php:1294 -#: include/classes/validators/CApiInputValidator.php:1299 -#: include/classes/validators/CApiInputValidator.php:1304 -#: include/classes/validators/CApiInputValidator.php:1350 -#: include/classes/validators/CApiInputValidator.php:1359 -#: include/classes/validators/CApiInputValidator.php:1365 -#: include/classes/validators/CApiInputValidator.php:1393 -#: include/classes/validators/CApiInputValidator.php:1403 -#: include/classes/validators/CApiInputValidator.php:1409 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1293 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:1387 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 #: include/classes/validators/CApiInputValidator.php:1447 -#: include/classes/validators/CApiInputValidator.php:1459 -#: include/classes/validators/CApiInputValidator.php:1468 -#: include/classes/validators/CApiInputValidator.php:1475 -#: include/classes/validators/CApiInputValidator.php:1480 -#: include/classes/validators/CApiInputValidator.php:1522 -#: include/classes/validators/CApiInputValidator.php:1539 -#: include/classes/validators/CApiInputValidator.php:1565 -#: include/classes/validators/CApiInputValidator.php:1572 -#: include/classes/validators/CApiInputValidator.php:1596 -#: include/classes/validators/CApiInputValidator.php:1601 +#: include/classes/validators/CApiInputValidator.php:1453 +#: include/classes/validators/CApiInputValidator.php:1481 +#: include/classes/validators/CApiInputValidator.php:1491 +#: include/classes/validators/CApiInputValidator.php:1497 +#: include/classes/validators/CApiInputValidator.php:1535 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1568 +#: include/classes/validators/CApiInputValidator.php:1610 #: include/classes/validators/CApiInputValidator.php:1627 -#: include/classes/validators/CApiInputValidator.php:1634 -#: include/classes/validators/CApiInputValidator.php:1661 -#: include/classes/validators/CApiInputValidator.php:1668 -#: include/classes/validators/CApiInputValidator.php:1695 -#: include/classes/validators/CApiInputValidator.php:1704 -#: include/classes/validators/CApiInputValidator.php:1741 -#: include/classes/validators/CApiInputValidator.php:1757 -#: include/classes/validators/CApiInputValidator.php:1768 -#: include/classes/validators/CApiInputValidator.php:1801 -#: include/classes/validators/CApiInputValidator.php:1892 -#: include/classes/validators/CApiInputValidator.php:1977 -#: include/classes/validators/CApiInputValidator.php:1982 -#: include/classes/validators/CApiInputValidator.php:2009 -#: include/classes/validators/CApiInputValidator.php:2019 -#: include/classes/validators/CApiInputValidator.php:2051 -#: include/classes/validators/CApiInputValidator.php:2063 -#: include/classes/validators/CApiInputValidator.php:2093 -#: include/classes/validators/CApiInputValidator.php:2100 -#: include/classes/validators/CApiInputValidator.php:2132 -#: include/classes/validators/CApiInputValidator.php:2143 -#: include/classes/validators/CApiInputValidator.php:2166 -#: include/classes/validators/CApiInputValidator.php:2181 -#: include/classes/validators/CApiInputValidator.php:2234 -#: include/classes/validators/CApiInputValidator.php:2244 -#: include/classes/validators/CApiInputValidator.php:2254 -#: include/classes/validators/CApiInputValidator.php:2278 -#: include/classes/validators/CApiInputValidator.php:2285 -#: include/classes/validators/CApiInputValidator.php:2307 -#: include/classes/validators/CApiInputValidator.php:2327 -#: include/classes/validators/CApiInputValidator.php:2357 -#: include/classes/validators/CApiInputValidator.php:2362 -#: include/classes/validators/CApiInputValidator.php:2398 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1660 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1689 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1722 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1792 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CApiInputValidator.php:1856 +#: include/classes/validators/CApiInputValidator.php:1889 +#: include/classes/validators/CApiInputValidator.php:1980 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2080 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2117 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2161 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2198 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2241 +#: include/classes/validators/CApiInputValidator.php:2264 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2342 +#: include/classes/validators/CApiInputValidator.php:2352 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2383 #: include/classes/validators/CApiInputValidator.php:2405 -#: include/classes/validators/CApiInputValidator.php:2430 -#: include/classes/validators/CApiInputValidator.php:2435 -#: include/classes/validators/CApiInputValidator.php:2441 -#: include/classes/validators/CApiInputValidator.php:2474 -#: include/classes/validators/CApiInputValidator.php:2507 -#: include/classes/validators/CApiInputValidator.php:2514 -#: include/classes/validators/CApiInputValidator.php:2538 -#: include/classes/validators/CApiInputValidator.php:2545 +#: include/classes/validators/CApiInputValidator.php:2425 +#: include/classes/validators/CApiInputValidator.php:2455 +#: include/classes/validators/CApiInputValidator.php:2460 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2503 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 +#: include/classes/validators/CApiInputValidator.php:2572 +#: include/classes/validators/CApiInputValidator.php:2605 +#: include/classes/validators/CApiInputValidator.php:2612 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2643 +#: include/classes/validators/CApiInputValidator.php:2668 +#: include/classes/validators/CApiInputValidator.php:2675 +#: include/classes/validators/CApiInputValidator.php:2703 +#: include/classes/validators/CApiInputValidator.php:2708 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -9909,43 +9725,38 @@ msgstr "無效的回應編碼 \"%1$s\"." #: include/classes/import/validators/C42XmlValidator.php:1316 #: include/classes/import/validators/C44XmlValidator.php:1721 #: include/classes/import/validators/C44XmlValidator.php:1983 -#: include/classes/import/validators/C44XmlValidator.php:2093 -#: include/classes/import/validators/C44XmlValidator.php:2113 -#: include/classes/import/validators/C44XmlValidator.php:2137 -#: include/classes/import/validators/C44XmlValidator.php:2179 -#: include/classes/import/validators/C44XmlValidator.php:2240 +#: include/classes/import/validators/C44XmlValidator.php:2095 +#: include/classes/import/validators/C44XmlValidator.php:2115 +#: include/classes/import/validators/C44XmlValidator.php:2139 +#: include/classes/import/validators/C44XmlValidator.php:2181 #: include/classes/import/validators/C50XmlValidator.php:1864 #: include/classes/import/validators/C50XmlValidator.php:2126 -#: include/classes/import/validators/C50XmlValidator.php:2236 -#: include/classes/import/validators/C50XmlValidator.php:2256 -#: include/classes/import/validators/C50XmlValidator.php:2280 -#: include/classes/import/validators/C50XmlValidator.php:2322 -#: include/classes/import/validators/C50XmlValidator.php:2383 +#: include/classes/import/validators/C50XmlValidator.php:2238 +#: include/classes/import/validators/C50XmlValidator.php:2258 +#: include/classes/import/validators/C50XmlValidator.php:2282 +#: include/classes/import/validators/C50XmlValidator.php:2324 #: include/classes/import/validators/C52XmlValidator.php:1986 #: include/classes/import/validators/C52XmlValidator.php:2216 -#: include/classes/import/validators/C52XmlValidator.php:2401 -#: include/classes/import/validators/C52XmlValidator.php:2421 -#: include/classes/import/validators/C52XmlValidator.php:2445 -#: include/classes/import/validators/C52XmlValidator.php:2487 -#: include/classes/import/validators/C52XmlValidator.php:2548 -#: include/classes/import/validators/C52XmlValidator.php:2581 -#: include/classes/import/validators/C52XmlValidator.php:2587 +#: include/classes/import/validators/C52XmlValidator.php:2403 +#: include/classes/import/validators/C52XmlValidator.php:2423 +#: include/classes/import/validators/C52XmlValidator.php:2447 +#: include/classes/import/validators/C52XmlValidator.php:2489 +#: include/classes/import/validators/C52XmlValidator.php:2566 +#: include/classes/import/validators/C52XmlValidator.php:2572 #: include/classes/import/validators/C54XmlValidator.php:2041 #: include/classes/import/validators/C54XmlValidator.php:2271 -#: include/classes/import/validators/C54XmlValidator.php:2456 -#: include/classes/import/validators/C54XmlValidator.php:2476 -#: include/classes/import/validators/C54XmlValidator.php:2500 -#: include/classes/import/validators/C54XmlValidator.php:2561 -#: include/classes/import/validators/C54XmlValidator.php:2594 -#: include/classes/import/validators/C54XmlValidator.php:2600 +#: include/classes/import/validators/C54XmlValidator.php:2458 +#: include/classes/import/validators/C54XmlValidator.php:2478 +#: include/classes/import/validators/C54XmlValidator.php:2502 +#: include/classes/import/validators/C54XmlValidator.php:2579 +#: include/classes/import/validators/C54XmlValidator.php:2585 #: include/classes/import/validators/C60XmlValidator.php:2042 #: include/classes/import/validators/C60XmlValidator.php:2272 -#: include/classes/import/validators/C60XmlValidator.php:2457 -#: include/classes/import/validators/C60XmlValidator.php:2477 -#: include/classes/import/validators/C60XmlValidator.php:2501 -#: include/classes/import/validators/C60XmlValidator.php:2562 -#: include/classes/import/validators/C60XmlValidator.php:2595 -#: include/classes/import/validators/C60XmlValidator.php:2601 +#: include/classes/import/validators/C60XmlValidator.php:2459 +#: include/classes/import/validators/C60XmlValidator.php:2479 +#: include/classes/import/validators/C60XmlValidator.php:2503 +#: include/classes/import/validators/C60XmlValidator.php:2580 +#: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:163 #: include/classes/import/validators/CXmlValidatorGeneral.php:182 #: include/classes/import/validators/CXmlValidatorGeneral.php:201 @@ -9966,7 +9777,7 @@ msgstr "" #: include/classes/helpers/CMenuHelper.php:103 #: include/classes/helpers/CRoleHelper.php:278 #: include/views/configuration.host.edit.php:446 -#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348 +#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329 msgid "Inventory" msgstr "資產記錄" @@ -10007,7 +9818,7 @@ msgstr "以用戶密碼尋找是不可能的." msgid "Italian (it_IT)" msgstr "意大利語 (it_IT)" -#: app/controllers/CControllerAuditLogList.php:224 +#: app/controllers/CControllerAuditLogList.php:225 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99 #: app/views/popup.triggerwizard.php:92 #: include/classes/screens/CScreenHistory.php:268 @@ -10039,7 +9850,7 @@ msgstr "" 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." -#: include/classes/api/services/CDiscoveryRule.php:2284 +#: include/classes/api/services/CDiscoveryRule.php:2280 #: include/classes/api/services/CItemGeneral.php:2233 #, c-format msgid "Item \"%1$s\" does not exist or you have no access to this item" @@ -10053,7 +9864,7 @@ msgstr "項目已新增" msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually." msgstr "" -#: items.php:1053 +#: items.php:1021 msgid "Item copied" msgid_plural "Items copied" msgstr[0] "" @@ -10066,12 +9877,12 @@ msgstr "項目數量" msgid "Item deleted" msgstr "項目已刪除" -#: items.php:1011 +#: items.php:979 msgid "Item disabled" msgid_plural "Items disabled" msgstr[0] "" -#: items.php:1010 +#: items.php:978 msgid "Item enabled" msgid_plural "Items enabled" msgstr[0] "" @@ -10080,7 +9891,7 @@ msgstr[0] "" msgid "Item in \"not supported\" state" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1455 +#: app/controllers/CControllerPopupTriggerExpr.php:1462 msgid "Item not selected" msgstr "" @@ -10089,7 +9900,7 @@ msgstr "" msgid "Item pre-processing is missing parameters: %1$s" msgstr "" -#: app/controllers/CControllerAuditLogList.php:225 +#: app/controllers/CControllerAuditLogList.php:226 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48 #: include/forms.inc.php:892 @@ -10125,8 +9936,8 @@ msgid "Item prototype updated" msgid_plural "Item prototypes updated" msgstr[0] "" -#: include/classes/api/services/CDashboardGeneral.php:429 -#: include/classes/api/services/CDashboardGeneral.php:437 +#: include/classes/api/services/CDashboardGeneral.php:469 +#: include/classes/api/services/CDashboardGeneral.php:477 #, c-format msgid "Item prototype with ID \"%1$s\" is not available." msgstr "" @@ -10152,7 +9963,7 @@ msgstr "" msgid "Item tags" msgstr "" -#: jsLoader.php:370 +#: jsLoader.php:351 msgid "Item type does not use interface" msgstr "" @@ -10184,8 +9995,8 @@ msgstr "" msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used." msgstr "" -#: include/classes/api/services/CDashboardGeneral.php:402 -#: include/classes/api/services/CDashboardGeneral.php:409 +#: include/classes/api/services/CDashboardGeneral.php:442 +#: include/classes/api/services/CDashboardGeneral.php:449 #, c-format msgid "Item with ID \"%1$s\" is not available." msgstr "" @@ -10236,11 +10047,11 @@ msgstr "鍵值為 \"%1$s\"的項目已存在於\"%2$s\" ." #: include/views/configuration.template.list.php:118 #: include/views/configuration.template.list.php:206 #: include/views/inventory.host.view.php:182 -#: include/views/inventory.host.view.php:215 items.php:1292 +#: include/views/inventory.host.view.php:215 items.php:1214 msgid "Items" msgstr "項目" -#: items.php:1126 +#: items.php:1048 msgid "Items deleted" msgstr "項目已刪除" @@ -10258,7 +10069,7 @@ msgstr "監控項已更新" #: app/views/monitoring.widget.hostavail.view.php:29 #: include/classes/widgets/views/widget.hostavail.form.view.php:48 -#: include/hosts.inc.php:468 include/hosts.inc.php:1272 +#: include/hosts.inc.php:468 include/hosts.inc.php:1205 #: include/items.inc.php:349 #: include/views/js/configuration.host.edit.js.php:177 msgid "JMX" @@ -10283,6 +10094,10 @@ msgstr "JMX介面" msgid "JSON" msgstr "" +#: include/classes/mvc/CController.php:231 +msgid "JSON array input is expected." +msgstr "" + #: app/views/popup.massupdate.item.php:95 #: include/views/configuration.host.discovery.edit.php:272 #: include/views/configuration.item.edit.php:308 @@ -10295,7 +10110,7 @@ msgstr "" msgid "JSON is expected" msgstr "" -#: include/classes/validators/CNewValidator.php:107 +#: include/classes/validators/CNewValidator.php:113 msgid "JSON string is expected" msgstr "" @@ -10313,7 +10128,7 @@ msgstr "" msgid "Jan" msgstr "一月" -#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221 +#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202 msgid "January" msgstr "一月" @@ -10335,7 +10150,7 @@ msgstr "" msgid "Jul" msgstr "七月" -#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227 +#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208 msgid "July" msgstr "七月" @@ -10343,7 +10158,7 @@ msgstr "七月" msgid "Jun" msgstr "六月" -#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226 +#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207 msgid "June" msgstr "六月" @@ -10493,22 +10308,6 @@ msgid "Last %1$d year" msgid_plural "Last %1$d years" msgstr[0] "" -#: srv_status.php:42 -msgid "Last 24 hours" -msgstr "" - -#: srv_status.php:44 -msgid "Last 30 days" -msgstr "" - -#: srv_status.php:45 -msgid "Last 365 days" -msgstr "" - -#: srv_status.php:43 -msgid "Last 7 days" -msgstr "" - #: app/views/administration.token.list.php:144 #: app/views/administration.user.token.list.php:99 msgid "Last accessed at" @@ -10520,11 +10319,11 @@ msgstr "" msgid "Last check" msgstr "最近檢查記錄" -#: jsLoader.php:351 +#: jsLoader.php:332 msgid "Last hour graph" msgstr "最近一小時" -#: jsLoader.php:352 +#: jsLoader.php:333 msgid "Last month graph" msgstr "上月圖形" @@ -10562,11 +10361,11 @@ msgstr "" msgid "Last value" msgstr "最新數據" -#: jsLoader.php:353 +#: jsLoader.php:334 msgid "Last week graph" msgstr "仩週圖形" -#: app/controllers/CControllerLatestView.php:187 +#: app/controllers/CControllerLatestView.php:189 #: app/partials/monitoring.host.view.html.php:35 #: app/partials/monitoring.host.view.html.php:105 #: app/partials/monitoring.host.view.html.php:111 @@ -10575,11 +10374,11 @@ msgstr "仩週圖形" #: include/classes/helpers/CMenuHelper.php:61 #: include/classes/helpers/CRoleHelper.php:311 #: include/views/inventory.host.view.php:143 -#: include/views/inventory.host.view.php:149 jsLoader.php:349 +#: include/views/inventory.host.view.php:149 jsLoader.php:330 msgid "Latest data" msgstr "最新數據" -#: jsLoader.php:350 +#: jsLoader.php:331 msgid "Latest values" msgstr "最新數據" @@ -10620,7 +10419,7 @@ msgstr "" msgid "Left trim" msgstr "" -#: include/classes/widgets/views/widget.svggraph.form.view.php:294 +#: include/classes/widgets/views/widget.svggraph.form.view.php:295 msgid "Legend" msgstr "" @@ -10901,7 +10700,7 @@ msgstr "" msgid "M" msgstr "" -#: jsLoader.php:240 +#: jsLoader.php:221 msgctxt "Monday short" msgid "M" msgstr "M" @@ -10923,7 +10722,7 @@ msgstr "MD2" msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)" msgstr "" -#: app/controllers/CControllerAuditLogList.php:226 +#: app/controllers/CControllerAuditLogList.php:227 #: app/partials/hostmacros.inherited.list.html.php:48 #: app/partials/hostmacros.list.html.php:35 #: app/partials/massupdate.macros.tab.php:29 @@ -10934,12 +10733,12 @@ msgid "Macro" msgstr "巨集" #: include/classes/api/services/CHostBase.php:577 -#: include/classes/api/services/CUserMacro.php:668 +#: include/classes/api/services/CUserMacro.php:655 #, c-format msgid "Macro \"%1$s\" already exists on \"%2$s\"." msgstr "巨集\"%1$s\"已存在於\"%2$s\"." -#: include/classes/api/services/CUserMacro.php:420 +#: include/classes/api/services/CUserMacro.php:411 #, c-format msgid "Macro \"%1$s\" already exists." msgstr "巨集\"%1$s\"已存在." @@ -10967,7 +10766,7 @@ msgstr "巨集已更新" #: app/views/monitoring.map.view.php:45 #: include/views/monitoring.overview.items.php:70 #: include/views/monitoring.overview.triggers.php:106 report2.php:198 -#: report4.php:124 srv_status.php:161 +#: report4.php:124 msgid "Main filter" msgstr "" @@ -10975,7 +10774,7 @@ msgstr "" msgid "Main navigation" msgstr "" -#: app/controllers/CControllerAuditLogList.php:227 +#: app/controllers/CControllerAuditLogList.php:228 #: include/classes/helpers/CMenuHelper.php:174 #: include/classes/helpers/CRoleHelper.php:362 #: include/views/configuration.maintenance.edit.php:259 @@ -11058,7 +10857,7 @@ msgstr "" #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:281 -#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206 +#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139 #: include/views/configuration.host.edit.php:382 #: include/views/configuration.host.prototype.edit.php:357 msgid "Manual" @@ -11080,13 +10879,13 @@ msgstr "" msgid "Manually closed" msgstr "" -#: app/controllers/CControllerAuditLogList.php:228 +#: app/controllers/CControllerAuditLogList.php:229 #: include/classes/widgets/CWidgetConfig.php:54 #: include/classes/widgets/forms/CWidgetFormMap.php:41 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27 #: include/views/js/monitoring.sysmaps.js.php:93 #: include/views/js/monitoring.sysmaps.js.php:208 -#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25 +#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25 msgid "Map" msgstr "拓墣圖" @@ -11155,7 +10954,7 @@ msgstr "" msgid "Map update failed." msgstr "" -#: include/classes/api/services/CDashboardGeneral.php:549 +#: include/classes/api/services/CDashboardGeneral.php:589 #, c-format msgid "Map with ID \"%1$s\" is not available." msgstr "" @@ -11187,7 +10986,7 @@ msgstr "拓墣圖" msgid "Mar" msgstr "三月" -#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223 +#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204 msgid "March" msgstr "三月" @@ -11291,7 +11090,7 @@ msgid "Maximum required %1$s database version is %2$s." msgstr "" #: app/controllers/CControllerTimeSelectorUpdate.php:249 -#: include/classes/mvc/CController.php:259 +#: include/classes/mvc/CController.php:312 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444 #: include/validate.inc.php:477 #, c-format @@ -11304,7 +11103,7 @@ msgstr[0] "" msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" -#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225 +#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206 msgid "May" msgstr "五月" @@ -11319,15 +11118,12 @@ msgstr "五月" msgid "Media" msgstr "示警媒介" -#: app/controllers/CControllerAuditLogList.php:229 +#: app/controllers/CControllerAuditLogList.php:230 #: app/views/administration.mediatype.edit.php:271 report4.php:96 msgid "Media type" msgstr "示警媒介類型" -#: include/classes/api/services/CMediatype.php:214 -#: include/classes/api/services/CMediatype.php:230 -#: include/classes/api/services/CMediatype.php:509 -#: include/classes/api/services/CMediatype.php:521 +#: include/classes/api/services/CMediatype.php:408 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "" @@ -11353,11 +11149,6 @@ msgid "Media type enabled" msgid_plural "Media types enabled" msgstr[0] "示警媒介類型已啟用" -#: include/classes/api/services/CMediatype.php:197 -#, c-format -msgid "Media type is missing parameters: %1$s" -msgstr "" - #: app/controllers/CControllerPopupMediatypeTestSend.php:45 #: app/controllers/CControllerPopupMediatypeTestSend.php:145 msgid "Media type test failed." @@ -11387,7 +11178,7 @@ msgstr "" msgid "Media types" msgstr "示警媒介類型" -#: include/classes/api/services/CMediatype.php:1149 +#: include/classes/api/services/CMediatype.php:827 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "" @@ -11475,7 +11266,7 @@ msgstr "訊息中" msgid "Method not found." msgstr "未發現方法." -#: include/httptest.inc.php:395 +#: include/httptest.inc.php:399 msgid "Microsoft Edge" msgstr "" @@ -11537,7 +11328,7 @@ msgid "Minimum severity" msgstr "" #: app/controllers/CControllerTimeSelectorUpdate.php:244 -#: include/classes/mvc/CController.php:252 +#: include/classes/mvc/CController.php:305 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439 #: include/validate.inc.php:470 #, c-format @@ -11595,7 +11386,7 @@ msgstr "節點" msgid "Model" msgstr "模型" -#: app/controllers/CControllerAuditLogList.php:230 +#: app/controllers/CControllerAuditLogList.php:231 #: app/views/administration.module.edit.php:52 msgid "Module" msgstr "" @@ -11629,7 +11420,7 @@ msgstr[0] "" msgid "Module updated: %1$s." msgstr "" -#: include/classes/api/services/CRole.php:695 +#: include/classes/api/services/CRole.php:714 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -11655,7 +11446,7 @@ msgstr "" msgid "Mon" msgstr "一" -#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233 +#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214 msgid "Monday" msgstr "週一" @@ -11695,11 +11486,11 @@ msgstr "月" msgid "Monthly" msgstr "每月" -#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312 +#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293 msgid "More matches found..." msgstr "" -#: jsLoader.php:322 +#: jsLoader.php:303 #, c-format msgctxt "screen reader" msgid "More than %1$d matches for %2$s found" @@ -11723,7 +11514,7 @@ msgstr "" msgid "Most critical of child services" msgstr "" -#: include/httptest.inc.php:405 +#: include/httptest.inc.php:409 msgid "Mozilla Firefox" msgstr "Mozilla Firefox" @@ -11736,7 +11527,7 @@ msgstr "" msgid "Multiple PROBLEM events" msgstr "多重問題(PROBLEM)事件" -#: jsLoader.php:282 +#: jsLoader.php:263 msgid "Mute" msgstr "靜音" @@ -11865,11 +11656,11 @@ msgstr "" #: app/views/popup.massupdate.template.php:140 #: app/views/popup.massupdate.trigger.php:84 #: app/views/popup.massupdate.trigger.php:98 -#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68 -#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270 -#: app/views/popup.services.php:40 app/views/popup.services.php:58 -#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81 -#: app/views/popup.valuemap.edit.php:103 +#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71 +#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279 +#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41 +#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31 +#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44 #: graphs.php:43 host_discovery.php:50 httpconf.php:42 #: include/classes/screens/CScreenHttpTest.php:113 @@ -12027,19 +11818,21 @@ msgstr "新的觸發條件" msgid "New dashboard" msgstr "" -#: jsLoader.php:268 +#: jsLoader.php:249 msgid "New element" msgstr "新的組件" -#: include/correlation.inc.php:51 include/correlation.inc.php:143 +#: include/classes/helpers/CCorrelationHelper.php:54 +#: include/classes/helpers/CCorrelationHelper.php:129 msgid "New event host group" msgstr "" -#: include/correlation.inc.php:50 include/correlation.inc.php:138 +#: include/classes/helpers/CCorrelationHelper.php:53 +#: include/classes/helpers/CCorrelationHelper.php:123 msgid "New event tag name" msgstr "" -#: include/correlation.inc.php:54 +#: include/classes/helpers/CCorrelationHelper.php:57 msgid "New event tag value" msgstr "" @@ -12051,7 +11844,7 @@ msgstr "" msgid "New regular expression" msgstr "新的正規表示式" -#: app/controllers/CControllerPopupServiceEdit.php:183 +#: app/controllers/CControllerPopupServiceEdit.php:216 msgid "New service" msgstr "" @@ -12059,7 +11852,7 @@ msgstr "" msgid "New service time" msgstr "新的服務時間" -#: app/views/popup.condition.common.php:121 +#: app/views/popup.condition.common.php:120 msgid "New tag name" msgstr "" @@ -12068,7 +11861,7 @@ msgid "New triggers" msgstr "" #: app/views/monitoring.dashboard.view.php:175 -#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181 +#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162 msgid "Next page" msgstr "" @@ -12086,7 +11879,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:680 +#: app/views/popup.condition.common.php:679 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97 #: app/views/popup.massupdate.item.php:328 #: app/views/popup.massupdate.item.php:337 @@ -12115,30 +11908,6 @@ msgstr "" msgid "No" msgstr "不" -#: include/classes/api/services/CCorrelation.php:643 -#: include/classes/api/services/CCorrelation.php:657 -#: include/classes/api/services/CCorrelation.php:858 -#: include/classes/api/services/CCorrelation.php:866 -#: include/classes/api/services/CCorrelation.php:879 -#: include/classes/api/services/CCorrelation.php:895 -#: include/classes/api/services/CCorrelation.php:907 -#: include/classes/api/services/CCorrelation.php:1007 -#: include/classes/api/services/CCorrelation.php:1042 -#: include/classes/api/services/CCorrelation.php:1076 -#: include/classes/api/services/CCorrelation.php:1097 -#: include/classes/api/services/CCorrelation.php:1114 -#: include/classes/api/services/CCorrelation.php:1134 -#: include/classes/api/services/CCorrelation.php:1242 -#: include/classes/api/services/CCorrelation.php:1300 -#, c-format -msgid "No \"%1$s\" given for correlation \"%2$s\"." -msgstr "" - -#: include/classes/api/services/CCorrelation.php:705 -#, c-format -msgid "No \"%1$s\" given for correlation." -msgstr "" - #: include/classes/api/services/CGraphPrototype.php:39 #, c-format msgid "No \"%1$s\" given for graph prototype." @@ -12154,11 +11923,6 @@ msgstr "" msgid "No \"%1$s\" given for map." msgstr "" -#: include/classes/api/services/CMediatype.php:453 -#, c-format -msgid "No \"%1$s\" given for media type." -msgstr "" - #: include/classes/api/services/CAction.php:2655 #: include/classes/api/services/CAction.php:2781 #: include/classes/api/services/CAction.php:2975 @@ -12166,7 +11930,7 @@ msgstr "" msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1851 +#: include/classes/api/services/CDiscoveryRule.php:1847 #, c-format msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"." msgstr "" @@ -12176,7 +11940,7 @@ msgstr "" msgid "No \"%2$s\" given for the filter of action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1817 +#: include/classes/api/services/CDiscoveryRule.php:1813 #, c-format msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"." msgstr "" @@ -12193,11 +11957,6 @@ msgstr "沒有指定的認證用戶名稱" msgid "No changes." msgstr "" -#: include/classes/api/services/CCorrelation.php:1022 -#, c-format -msgid "No condition type given for correlation \"%1$s\"." -msgstr "" - #: app/views/configuration.correlation.edit.php:56 #: include/views/configuration.action.edit.php:56 msgid "No conditions defined." @@ -12228,7 +11987,7 @@ msgstr "\"%2$s\"上之\"%1$s\"類型無預設介面." msgid "No details" msgstr "沒有細節" -#: include/classes/api/services/CDiscoveryRule.php:640 +#: include/classes/api/services/CDiscoveryRule.php:636 msgid "No discovery rule IDs given." msgstr "沒有所稱的探索規則ID" @@ -12264,7 +12023,7 @@ msgstr "" msgid "No graphs added." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:643 +#: include/classes/api/services/CDiscoveryRule.php:639 msgid "No host IDs given." msgstr "沒有所知的主機IDs" @@ -12294,7 +12053,7 @@ msgstr "沒有圖片" #: app/views/popup.massupdate.item.php:67 #: include/views/configuration.host.discovery.edit.php:493 #: include/views/configuration.item.edit.php:546 -#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369 +#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350 msgid "No interface found" msgstr "沒有找到介面" @@ -12328,7 +12087,7 @@ msgstr "" msgid "No maps added." msgstr "" -#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311 +#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292 msgid "No matches found" msgstr "" @@ -12336,17 +12095,46 @@ msgstr "" msgid "No new modules discovered" msgstr "" -#: include/classes/api/services/CCorrelation.php:1307 -#, c-format -msgid "No operation type given for correlation \"%1$s\"." -msgstr "" - #: include/classes/api/services/CUser.php:1550 #: include/classes/api/services/CUser.php:2054 msgid "No permissions for system access." msgstr "沒有系統存取的許可權" #: include/classes/api/clients/CLocalApiClient.php:105 +#: include/classes/api/services/CAuthentication.php:88 +#: include/classes/api/services/CAutoregistration.php:87 +#: include/classes/api/services/CCorrelation.php:133 +#: include/classes/api/services/CCorrelation.php:414 +#: include/classes/api/services/CCorrelation.php:460 +#: include/classes/api/services/CHostGroup.php:400 +#: include/classes/api/services/CHousekeeping.php:85 +#: include/classes/api/services/CIconMap.php:157 +#: include/classes/api/services/CIconMap.php:219 +#: include/classes/api/services/CIconMap.php:505 +#: include/classes/api/services/CMediatype.php:179 +#: include/classes/api/services/CMediatype.php:267 +#: include/classes/api/services/CMediatype.php:801 +#: include/classes/api/services/CModule.php:119 +#: include/classes/api/services/CModule.php:172 +#: include/classes/api/services/CModule.php:247 +#: include/classes/api/services/CProxy.php:187 +#: include/classes/api/services/CProxy.php:218 +#: include/classes/api/services/CProxy.php:388 +#: include/classes/api/services/CRegexp.php:48 +#: include/classes/api/services/CRegexp.php:115 +#: include/classes/api/services/CRegexp.php:290 +#: include/classes/api/services/CRegexp.php:375 +#: include/classes/api/services/CRole.php:137 +#: include/classes/api/services/CRole.php:230 +#: include/classes/api/services/CRole.php:345 +#: include/classes/api/services/CScript.php:240 +#: include/classes/api/services/CScript.php:316 +#: include/classes/api/services/CScript.php:825 +#: include/classes/api/services/CSettings.php:135 +#: include/classes/api/services/CUserGroup.php:176 +#: include/classes/api/services/CUserGroup.php:260 +#: include/classes/api/services/CUserGroup.php:882 +#: include/classes/api/services/CUser.php:258 #, c-format msgid "No permissions to call \"%1$s.%2$s\"." msgstr "" @@ -12354,7 +12142,7 @@ msgstr "" #: app/controllers/CControllerChartsView.php:132 #: app/controllers/CControllerChartsView.php:154 #: app/controllers/CControllerDashboardPrint.php:96 -#: app/controllers/CControllerDashboardShareUpdate.php:93 +#: app/controllers/CControllerDashboardShareUpdate.php:98 #: app/controllers/CControllerDashboardView.php:206 #: app/controllers/CControllerDashboardView.php:254 #: app/controllers/CControllerHintboxActionlist.php:50 @@ -12382,19 +12170,18 @@ msgstr "" #: include/classes/api/services/CAction.php:1863 #: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CConfiguration.php:78 -#: include/classes/api/services/CCorrelation.php:498 -#: include/classes/api/services/CCorrelation.php:680 -#: include/classes/api/services/CCorrelation.php:724 -#: include/classes/api/services/CCorrelation.php:934 +#: include/classes/api/services/CCorrelation.php:497 +#: include/classes/api/services/CCorrelation.php:653 +#: include/classes/api/services/CCorrelation.php:688 #: include/classes/api/services/CDashboardGeneral.php:77 -#: include/classes/api/services/CDashboardGeneral.php:233 -#: include/classes/api/services/CDashboardGeneral.php:248 +#: include/classes/api/services/CDashboardGeneral.php:274 +#: include/classes/api/services/CDashboardGeneral.php:289 #: include/classes/api/services/CDashboard.php:343 -#: include/classes/api/services/CDiscoveryRule.php:578 -#: include/classes/api/services/CDiscoveryRule.php:619 -#: include/classes/api/services/CDiscoveryRule.php:655 -#: include/classes/api/services/CDiscoveryRule.php:1770 -#: include/classes/api/services/CDiscoveryRule.php:2044 +#: include/classes/api/services/CDiscoveryRule.php:574 +#: include/classes/api/services/CDiscoveryRule.php:615 +#: include/classes/api/services/CDiscoveryRule.php:651 +#: include/classes/api/services/CDiscoveryRule.php:1766 +#: include/classes/api/services/CDiscoveryRule.php:2040 #: include/classes/api/services/CDRule.php:190 #: include/classes/api/services/CDRule.php:316 #: include/classes/api/services/CDRule.php:343 @@ -12409,16 +12196,22 @@ msgstr "" #: include/classes/api/services/CGraphPrototype.php:369 #: include/classes/api/services/CGraphPrototype.php:457 #: include/classes/api/services/CGraphPrototype.php:519 +#: include/classes/api/services/CHistory.php:365 #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 -#: include/classes/api/services/CHostGroup.php:790 -#: include/classes/api/services/CHostGroup.php:894 +#: include/classes/api/services/CHostGroup.php:598 +#: include/classes/api/services/CHostGroup.php:630 +#: include/classes/api/services/CHostGroup.php:1099 +#: include/classes/api/services/CHostGroup.php:1113 #: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1164 -#: include/classes/api/services/CHostGroup.php:1265 -#: include/classes/api/services/CHostGroup.php:1387 -#: include/classes/api/services/CHostGroup.php:1407 +#: include/classes/api/services/CHostGroup.php:1174 +#: include/classes/api/services/CHostGroup.php:1189 +#: include/classes/api/services/CHostGroup.php:1213 +#: include/classes/api/services/CHostGroup.php:1256 +#: include/classes/api/services/CHostGroup.php:1269 +#: include/classes/api/services/CHostGroup.php:1289 +#: include/classes/api/services/CHostGroup.php:1446 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 @@ -12438,12 +12231,10 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:285 -#: include/classes/api/services/CIconMap.php:528 -#: include/classes/api/services/CImage.php:364 -#: include/classes/api/services/CImage.php:444 -#: include/classes/api/services/CImage.php:497 -#: include/classes/api/services/CImage.php:513 +#: include/classes/api/services/CIconMap.php:279 +#: include/classes/api/services/CIconMap.php:541 +#: include/classes/api/services/CImage.php:361 +#: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 #: include/classes/api/services/CItemGeneral.php:329 #: include/classes/api/services/CItemGeneral.php:344 @@ -12464,27 +12255,29 @@ msgstr "" #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:478 -#: include/classes/api/services/CModule.php:214 -#: include/classes/api/services/CModule.php:246 -#: include/classes/api/services/CProxy.php:388 -#: include/classes/api/services/CProxy.php:623 -#: include/classes/api/services/CProxy.php:850 -#: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:369 +#: include/classes/api/services/CMediatype.php:365 +#: include/classes/api/services/CMediatype.php:817 +#: include/classes/api/services/CModule.php:226 +#: include/classes/api/services/CModule.php:264 +#: include/classes/api/services/CProxy.php:406 +#: include/classes/api/services/CProxy.php:648 +#: include/classes/api/services/CProxy.php:875 +#: include/classes/api/services/CRegexp.php:357 +#: include/classes/api/services/CRegexp.php:392 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 -#: include/classes/api/services/CRole.php:314 -#: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:540 -#: include/classes/api/services/CScript.php:982 -#: include/classes/api/services/CScript.php:1043 -#: include/classes/api/services/CScript.php:1060 -#: include/classes/api/services/CScript.php:1071 -#: include/classes/api/services/CService.php:389 -#: include/classes/api/services/CService.php:454 -#: include/classes/api/services/CService.php:1713 -#: include/classes/api/services/CService.php:1725 +#: include/classes/api/services/CRole.php:326 +#: include/classes/api/services/CRole.php:363 +#: include/classes/api/services/CScript.php:375 +#: include/classes/api/services/CScript.php:860 +#: include/classes/api/services/CScript.php:920 +#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:949 +#: include/classes/api/services/CService.php:410 +#: include/classes/api/services/CService.php:475 +#: include/classes/api/services/CService.php:895 +#: include/classes/api/services/CService.php:2234 +#: include/classes/api/services/CService.php:2246 #: include/classes/api/services/CTask.php:430 #: include/classes/api/services/CTask.php:477 #: include/classes/api/services/CTemplateDashboard.php:289 @@ -12501,14 +12294,14 @@ msgstr "" #: include/classes/api/services/CTriggerPrototype.php:515 #: include/classes/api/services/CTriggerPrototype.php:693 #: include/classes/api/services/CTriggerPrototype.php:711 -#: include/classes/api/services/CUserGroup.php:326 -#: include/classes/api/services/CUserGroup.php:893 -#: include/classes/api/services/CUserMacro.php:353 -#: include/classes/api/services/CUserMacro.php:463 -#: include/classes/api/services/CUserMacro.php:550 -#: include/classes/api/services/CUserMacro.php:742 -#: include/classes/api/services/CUserMacro.php:804 -#: include/classes/api/services/CUser.php:542 +#: include/classes/api/services/CUserGroup.php:315 +#: include/classes/api/services/CUserGroup.php:921 +#: include/classes/api/services/CUserMacro.php:345 +#: include/classes/api/services/CUserMacro.php:450 +#: include/classes/api/services/CUserMacro.php:537 +#: include/classes/api/services/CUserMacro.php:729 +#: include/classes/api/services/CUserMacro.php:791 +#: include/classes/api/services/CUser.php:548 #: include/classes/api/services/CUser.php:1245 #: include/classes/api/services/CUser.php:1773 #: include/classes/api/services/CValueMap.php:299 @@ -12517,7 +12310,7 @@ msgstr "" #: include/classes/helpers/CMapHelper.php:83 #: include/classes/screens/CScreenHistory.php:140 #: include/classes/screens/CScreenHttpTestDetails.php:46 -#: include/func.inc.php:1488 items.php:1240 +#: include/func.inc.php:1488 items.php:1162 msgid "No permissions to referred object or it does not exist!" msgstr "沒有所說的物件的許可權或其不存在!" @@ -12537,7 +12330,7 @@ msgstr "沒有指定的公開金鑰檔" msgid "No recipients for action operation message." msgstr "沒有動作操作訊息的收受者." -#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176 +#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157 msgid "No refresh" msgstr "" @@ -12549,7 +12342,7 @@ msgstr "沒有指定給動作操作命令的腳本." msgid "No target selected" msgstr "沒有選擇目標" -#: graphs.php:396 items.php:1058 +#: graphs.php:396 items.php:1026 msgid "No target selected." msgstr "沒有已選的目標" @@ -12566,7 +12359,7 @@ msgstr "沒有已定義的觸發器." msgid "No value" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1021 +#: include/classes/validators/CApiInputValidator.php:1078 msgid "Non-boolean flags are deprecated." msgstr "" @@ -12636,15 +12429,15 @@ msgstr "" msgid "Not all templates are linked to \"%1$s\"." msgstr "" -#: include/classes/api/services/CUser.php:571 +#: include/classes/api/services/CUser.php:577 msgid "Not allowed to set language for user \"guest\"." msgstr "" -#: include/classes/api/services/CUser.php:563 +#: include/classes/api/services/CUser.php:569 msgid "Not allowed to set password for user \"guest\"." msgstr "不允許設定用戶\"guest\"的密碼." -#: include/classes/api/services/CUser.php:574 +#: include/classes/api/services/CUser.php:580 msgid "Not allowed to set theme for user \"guest\"." msgstr "" @@ -12676,7 +12469,7 @@ msgstr "" msgid "Not supported" msgstr "不支持的" -#: app/views/popup.service.edit.php:219 +#: app/views/popup.service.edit.php:232 #: app/views/popup.service.time.edit.php:123 msgid "Note" msgstr "備註" @@ -12707,7 +12500,7 @@ msgstr "" msgid "Nov" msgstr "十一" -#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231 +#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212 msgid "November" msgstr "十一月" @@ -12894,8 +12687,8 @@ msgstr "OEM" #: app/views/js/reports.scheduledreport.edit.js.php:77 #: app/views/monitoring.service.list.edit.php:87 #: app/views/monitoring.service.list.php:83 -#: app/views/popup.service.edit.php:192 chart4.php:164 -#: include/classes/helpers/CServiceHelper.php:131 +#: app/views/popup.service.edit.php:205 chart4.php:164 +#: include/classes/helpers/CServiceHelper.php:133 #: include/classes/helpers/CSeverityHelper.php:34 #: include/classes/screens/CScreenHttpTestDetails.php:100 #: include/classes/screens/CScreenHttpTestDetails.php:186 @@ -12955,13 +12748,13 @@ msgstr "十月" msgid "Octal to decimal" msgstr "" -#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230 +#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211 msgid "October" msgstr "十月" #: app/views/administration.proxy.list.php:156 #: include/views/monitoring.sysmap.constructor.php:51 -#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250 +#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231 msgid "Off" msgstr "關" @@ -12969,30 +12762,31 @@ msgstr "關" #: app/views/js/popup.massupdate.js.php:415 #: app/views/js/popup.mediatypetest.edit.js.php:114 #: app/views/js/popup.scriptexec.js.php:53 -#: app/views/js/reports.auditlog.list.js.php:153 +#: app/views/js/reports.auditlog.list.js.php:157 #: app/views/monitoring.widget.web.view.php:30 #: include/views/configuration.triggers.list.php:94 #: include/views/js/common.item.edit.js.php:334 -#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381 +#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362 #: report2.php:507 msgid "Ok" msgstr "正常" -#: include/correlation.inc.php:49 include/correlation.inc.php:133 +#: include/classes/helpers/CCorrelationHelper.php:52 +#: include/classes/helpers/CCorrelationHelper.php:117 msgid "Old event tag name" msgstr "" -#: include/correlation.inc.php:53 +#: include/classes/helpers/CCorrelationHelper.php:56 msgid "Old event tag value" msgstr "" -#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:118 msgid "Old tag name" msgstr "" #: app/views/administration.proxy.list.php:155 #: include/views/monitoring.sysmap.constructor.php:51 -#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249 +#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230 msgid "On" msgstr "開" @@ -13008,35 +12802,15 @@ msgstr "一次" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1275 -msgid "One of the objects is left without a host group." -msgstr "" - #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25 msgid "One time only" msgstr "一次性" -#: app/partials/service.time.row.php:40 +#: app/views/js/popup.service.edit.js.php:229 #: app/views/popup.service.time.edit.php:48 msgid "One-time downtime" msgstr " 單次停機" -#: include/classes/api/services/CHostGroup.php:719 -msgid "Only Super Admins can create host groups." -msgstr "只有超級管理員可以創建主機群組." - -#: include/classes/api/services/CMediatype.php:178 -msgid "Only Super Admins can create media types." -msgstr "只有超級管理員可以創建示警媒介類型." - -#: include/classes/api/services/CMediatype.php:1139 -msgid "Only Super Admins can delete media types." -msgstr "只有超級管理員可以刪除示警媒介類型." - -#: include/classes/api/services/CMediatype.php:444 -msgid "Only Super Admins can edit media types." -msgstr "只有超級管理員可以編輯示警媒介類型." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "" @@ -13084,10 +12858,6 @@ msgstr "" msgid "Only services without problem tags" msgstr "" -#: include/classes/api/services/CCorrelation.php:519 -msgid "Only super admins can create correlations." -msgstr "" - #: include/classes/api/services/CDashboard.php:414 msgid "Only super admins can set dashboard owner." msgstr "" @@ -13096,15 +12866,11 @@ msgstr "" msgid "Only super admins can set report owner." msgstr "" -#: include/classes/api/services/CCorrelation.php:696 -msgid "Only super admins can update correlations." -msgstr "" - #: include/blocks.inc.php:561 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "只計算指派給啟用的主機的和相依於啟用的項目的觸發器" -#: include/httptest.inc.php:417 +#: include/httptest.inc.php:421 msgid "Opera" msgstr "Opera" @@ -13113,7 +12879,7 @@ msgstr "Opera" msgid "Operating system information. Returns string" msgstr "" -#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68 +#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71 msgid "Operation" msgstr "" @@ -13122,11 +12888,11 @@ msgstr "" msgid "Operation \"%1$s\" already exists." msgstr "" -#: include/classes/mvc/CController.php:164 include/validate.inc.php:308 +#: include/classes/mvc/CController.php:209 include/validate.inc.php:308 msgid "Operation cannot be performed due to unauthorized request." msgstr "由於未認證的請求, 操作無法完成." -#: jsLoader.php:141 +#: jsLoader.php:122 msgid "Operation details" msgstr "操作細節" @@ -13148,7 +12914,7 @@ msgstr "操作並無模板來操作." msgid "Operational data" msgstr "" -#: app/views/configuration.correlation.edit.php:140 +#: app/views/configuration.correlation.edit.php:142 #: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 #: include/views/configuration.action.edit.php:310 @@ -13157,33 +12923,33 @@ msgstr "" msgid "Operations" msgstr "操作" -#: app/views/popup.condition.common.php:73 -#: app/views/popup.condition.common.php:101 -#: app/views/popup.condition.common.php:120 -#: app/views/popup.condition.common.php:140 -#: app/views/popup.condition.common.php:208 -#: app/views/popup.condition.common.php:220 -#: app/views/popup.condition.common.php:251 -#: app/views/popup.condition.common.php:282 -#: app/views/popup.condition.common.php:293 -#: app/views/popup.condition.common.php:307 -#: app/views/popup.condition.common.php:325 -#: app/views/popup.condition.common.php:357 -#: app/views/popup.condition.common.php:372 -#: app/views/popup.condition.common.php:387 -#: app/views/popup.condition.common.php:420 -#: app/views/popup.condition.common.php:438 -#: app/views/popup.condition.common.php:468 -#: app/views/popup.condition.common.php:488 -#: app/views/popup.condition.common.php:520 -#: app/views/popup.condition.common.php:531 -#: app/views/popup.condition.common.php:549 -#: app/views/popup.condition.common.php:564 -#: app/views/popup.condition.common.php:580 -#: app/views/popup.condition.common.php:601 -#: app/views/popup.condition.common.php:614 -#: app/views/popup.condition.common.php:642 -#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:71 +#: app/views/popup.condition.common.php:100 +#: app/views/popup.condition.common.php:119 +#: app/views/popup.condition.common.php:139 +#: app/views/popup.condition.common.php:207 +#: app/views/popup.condition.common.php:219 +#: app/views/popup.condition.common.php:250 +#: app/views/popup.condition.common.php:281 +#: app/views/popup.condition.common.php:292 +#: app/views/popup.condition.common.php:306 +#: app/views/popup.condition.common.php:324 +#: app/views/popup.condition.common.php:356 +#: app/views/popup.condition.common.php:371 +#: app/views/popup.condition.common.php:386 +#: app/views/popup.condition.common.php:419 +#: app/views/popup.condition.common.php:437 +#: app/views/popup.condition.common.php:467 +#: app/views/popup.condition.common.php:487 +#: app/views/popup.condition.common.php:519 +#: app/views/popup.condition.common.php:530 +#: app/views/popup.condition.common.php:548 +#: app/views/popup.condition.common.php:563 +#: app/views/popup.condition.common.php:579 +#: app/views/popup.condition.common.php:600 +#: app/views/popup.condition.common.php:613 +#: app/views/popup.condition.common.php:641 +#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62 msgid "Operator" msgstr "操作者" @@ -13292,7 +13058,7 @@ msgstr "其它組態參數" msgid "Other parameters" msgstr "其他参數" -#: include/httptest.inc.php:428 +#: include/httptest.inc.php:432 #: include/views/configuration.httpconf.edit.php:88 msgid "Others" msgstr "其它" @@ -13306,7 +13072,7 @@ msgstr "" msgid "Output" msgstr "" -#: include/classes/api/services/CDashboardGeneral.php:292 +#: include/classes/api/services/CDashboardGeneral.php:333 #, c-format msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"." msgstr "" @@ -13335,7 +13101,7 @@ msgid "Override with name \"%1$s\" already exists." msgstr "" #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402 -#: include/classes/widgets/views/widget.svggraph.form.view.php:296 +#: include/classes/widgets/views/widget.svggraph.form.view.php:297 #: include/views/configuration.host.discovery.edit.php:867 #: include/views/configuration.host.discovery.edit.php:884 msgid "Overrides" @@ -13524,7 +13290,7 @@ msgstr "POP" #: app/views/hintbox.eventlist.php:116 #: app/views/monitoring.widget.problems.view.php:109 -#: include/classes/graph/CSvgGraph.php:1075 +#: include/classes/graph/CSvgGraph.php:1081 #: include/classes/screens/CScreenProblem.php:974 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36 @@ -13569,7 +13335,7 @@ msgstr "" msgid "PSK identity" msgstr "" -#: jsLoader.php:154 +#: jsLoader.php:135 #, c-format msgid "Page %1$d" msgstr "" @@ -13592,16 +13358,16 @@ msgstr "" msgid "Parameter" msgstr "参數" -#: include/classes/api/services/CUserGroup.php:230 -#: include/classes/api/services/CUserGroup.php:332 +#: include/classes/api/services/CUserGroup.php:236 +#: include/classes/api/services/CUserGroup.php:321 #: include/classes/api/services/CUser.php:182 #: include/classes/api/services/CUser.php:189 -#: include/classes/api/services/CUser.php:331 -#: include/classes/api/services/CUser.php:349 -#: include/classes/api/services/CUser.php:486 -#: include/classes/api/services/CUser.php:533 +#: include/classes/api/services/CUser.php:337 +#: include/classes/api/services/CUser.php:355 +#: include/classes/api/services/CUser.php:492 +#: include/classes/api/services/CUser.php:539 #: include/classes/api/services/CUser.php:1483 -#: include/classes/validators/CApiInputValidator.php:1086 +#: include/classes/validators/CApiInputValidator.php:1174 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" @@ -13631,7 +13397,7 @@ msgstr "上層項目" #: app/partials/monitoring.service.list.edit.php:40 #: app/partials/monitoring.service.list.php:34 -#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57 +#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60 msgid "Parent services" msgstr "" @@ -13648,7 +13414,7 @@ msgstr "上層觸發器" msgid "Parent web scenarios" msgstr "" -#: include/classes/api/services/CService.php:795 +#: include/classes/api/services/CService.php:1304 #, c-format msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"." msgstr "" @@ -13660,11 +13426,6 @@ msgstr "" msgid "Parse" msgstr "" -#: include/classes/api/services/CImage.php:218 -#, c-format -msgid "Parse SQL error [%1$s] in [%2$s]." -msgstr "解析SQL錯誤[%1$s]於[%2$s]之中." - #: include/classes/core/CJsonRpc.php:171 msgid "Parse error" msgstr "解析錯誤" @@ -13725,7 +13486,7 @@ msgstr "" msgid "Password requirements:" msgstr "" -#: jsLoader.php:177 jsLoader.php:270 +#: jsLoader.php:158 jsLoader.php:251 msgid "Paste" msgstr "" @@ -13735,15 +13496,15 @@ msgid "Paste page" msgstr "" #: app/views/js/configuration.dashboard.edit.js.php:210 -#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155 +#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136 msgid "Paste widget" msgstr "" -#: jsLoader.php:271 +#: jsLoader.php:252 msgid "Paste without external links" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:870 #: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "" @@ -13789,12 +13550,11 @@ msgstr "" #: app/partials/scheduledreport.formgrid.html.php:87 #: app/partials/scheduledreport.table.html.php:42 #: app/views/popup.lldoperation.php:116 -#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180 +#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 #: include/views/configuration.maintenance.edit.php:45 report4.php:101 -#: srv_status.php:164 msgid "Period" msgstr "期間" @@ -13883,7 +13643,7 @@ msgstr "" msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)." msgstr "" -#: jsLoader.php:259 +#: jsLoader.php:240 msgid "Please select two elements" msgstr "請選擇兩組件" @@ -13923,7 +13683,7 @@ msgstr "填入主機資產紀錄欄位" #: app/views/administration.proxy.edit.php:50 #: app/views/administration.script.edit.php:163 #: app/views/popup.itemtestedit.view.php:113 -#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307 +#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 msgid "Port" @@ -14012,7 +13772,7 @@ msgid "Previous month" msgstr "" #: app/views/monitoring.dashboard.view.php:157 -#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182 +#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163 msgid "Previous page" msgstr "" @@ -14143,7 +13903,7 @@ msgstr "" msgid "Problem is suppressed" msgstr "" -#: jsLoader.php:280 +#: jsLoader.php:261 msgid "Problem on" msgstr "問題在" @@ -14156,21 +13916,17 @@ msgstr "" msgid "Problem resolved" msgstr "" -#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286 -#: app/views/popup.services.php:60 +#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296 +#: app/views/popup.services.php:61 msgid "Problem tags" msgstr "" -#: srv_status.php:147 -msgid "Problem time" -msgstr "" - #: app/views/popup.mediatype.message.php:55 #: include/classes/helpers/CMediatypeHelper.php:79 msgid "Problem update" msgstr "" -#: app/controllers/CControllerProblemView.php:155 +#: app/controllers/CControllerProblemView.php:151 #: app/partials/common.filter.trigger.php:48 #: app/partials/monitoring.host.view.html.php:33 #: app/partials/monitoring.host.view.html.php:36 @@ -14184,9 +13940,9 @@ msgstr "" #: include/classes/widgets/CWidgetConfig.php:58 #: include/classes/widgets/forms/CWidgetFormProblems.php:35 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35 -#: include/classes/widgets/views/widget.svggraph.form.view.php:295 +#: include/classes/widgets/views/widget.svggraph.form.view.php:296 #: include/views/inventory.host.view.php:151 -#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507 +#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507 msgid "Problems" msgstr "問題" @@ -14220,7 +13976,7 @@ msgid "Prometheus to JSON" msgstr "" #: include/views/monitoring.sysmap.list.php:77 -#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156 +#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137 msgid "Properties" msgstr "" @@ -14241,13 +13997,13 @@ msgstr "" msgid "Proxies" msgstr "系統代理程式" -#: app/controllers/CControllerAuditLogList.php:231 +#: app/controllers/CControllerAuditLogList.php:232 #: app/views/administration.proxy.edit.php:90 #: app/views/administration.proxy.edit.php:143 #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 #: app/views/configuration.discovery.list.php:78 -#: app/views/popup.condition.common.php:521 +#: app/views/popup.condition.common.php:520 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62 #: include/views/configuration.host.list.php:114 #: include/views/configuration.host.list.php:118 @@ -14255,7 +14011,7 @@ msgstr "系統代理程式" msgid "Proxy" msgstr "系統代理程式" -#: include/classes/api/services/CProxy.php:581 +#: include/classes/api/services/CProxy.php:606 #, c-format msgid "Proxy \"%1$s\" already exists." msgstr "" @@ -14265,12 +14021,12 @@ msgstr "" msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist." msgstr "主機\"%2$s\"的系統代理程式\"%1$s\"不存在." -#: include/classes/api/services/CProxy.php:453 +#: include/classes/api/services/CProxy.php:471 #, c-format msgid "Proxy \"%1$s\" is used by action \"%2$s\"." msgstr "" -#: include/classes/api/services/CProxy.php:410 +#: include/classes/api/services/CProxy.php:428 #, c-format msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "系統代理程式\"%1$s\"是用在探索規則\"%2$s\"上." @@ -14362,7 +14118,7 @@ msgstr "" #: app/views/hintbox.eventlist.php:100 #: app/views/monitoring.widget.problems.view.php:93 -#: include/classes/graph/CSvgGraph.php:1071 +#: include/classes/graph/CSvgGraph.php:1077 #: include/classes/screens/CScreenProblem.php:958 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360 msgid "RESOLVED" @@ -14439,10 +14195,6 @@ msgstr "" msgid "Reads modbus data. Returns various types" msgstr "" -#: srv_status.php:146 -msgid "Reason" -msgstr "" - #: include/actions.inc.php:60 msgid "Received value" msgstr "接收到的值" @@ -14524,7 +14276,7 @@ msgstr "" msgid "Refresh" msgstr "" -#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178 +#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159 msgid "Refresh interval" msgstr "" @@ -14542,13 +14294,13 @@ msgstr "" msgid "Regular" msgstr "" -#: app/controllers/CControllerAuditLogList.php:232 +#: app/controllers/CControllerAuditLogList.php:233 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803 #: include/views/configuration.host.discovery.edit.php:687 msgid "Regular expression" msgstr "正規表示式" -#: include/classes/api/services/CRegexp.php:184 +#: include/classes/api/services/CRegexp.php:196 #, c-format msgid "Regular expression \"%1$s\" already exists." msgstr "" @@ -14580,7 +14332,7 @@ msgstr "正規表示式" msgid "Related reports" msgstr "" -#: jsLoader.php:163 +#: jsLoader.php:144 msgid "Release to create a widget." msgstr "" @@ -14612,8 +14364,6 @@ msgstr "遠端命令" #: app/partials/monitoring.problem.filter.php:191 #: app/partials/monitoring.problem.filter.php:340 #: app/partials/monitoring.problem.filter.php:373 -#: app/partials/service.statusrule.row.php:41 -#: app/partials/service.time.row.php:62 #: app/views/administration.iconmap.edit.php:88 #: app/views/administration.macros.edit.php:76 #: app/views/administration.mediatype.edit.php:111 @@ -14634,7 +14384,9 @@ msgstr "遠端命令" #: app/views/js/popup.massupdate.tmpl.js.php:59 #: app/views/js/popup.massupdate.tmpl.js.php:96 #: app/views/js/popup.massupdate.tmpl.js.php:108 -#: app/views/js/popup.service.edit.js.php:46 +#: app/views/js/popup.service.edit.js.php:194 +#: app/views/js/popup.service.edit.js.php:218 +#: app/views/js/popup.service.edit.js.php:237 #: app/views/popup.dashboard.share.edit.php:85 #: app/views/popup.dashboard.share.edit.php:106 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158 @@ -14647,7 +14399,7 @@ msgstr "遠端命令" #: app/views/popup.massupdate.template.php:54 #: app/views/popup.massupdate.template.php:136 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45 -#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97 +#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104 #: app/views/popup.valuemap.edit.php:91 #: include/classes/helpers/CTagFilterFieldHelper.php:82 #: include/classes/helpers/CTagFilterFieldHelper.php:135 @@ -14724,8 +14476,8 @@ msgstr "遠端命令" #: include/views/monitoring.sysmap.constructor.php:34 #: include/views/monitoring.sysmap.constructor.php:40 #: include/views/monitoring.sysmap.constructor.php:46 -#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198 -#: jsLoader.php:267 +#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179 +#: jsLoader.php:248 msgid "Remove" msgstr "移除" @@ -14765,7 +14517,7 @@ msgstr "" msgid "Removed" msgstr "" -#: jsLoader.php:317 +#: jsLoader.php:298 #, c-format msgctxt "screen reader" msgid "Removed, %1$s" @@ -14807,7 +14559,7 @@ msgid "Replace dependencies" msgstr "替換相依關係" #: app/controllers/CControllerPopupTriggerExpr.php:640 -#: app/controllers/CControllerPopupTriggerExpr.php:868 +#: app/controllers/CControllerPopupTriggerExpr.php:875 msgid "Replacement" msgstr "" @@ -14862,7 +14614,7 @@ msgstr "" msgid "Request body type" msgstr "" -#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146 +#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068 msgid "Request sent successfully" msgstr "" @@ -14904,8 +14656,8 @@ msgstr "要求的狀態碼" msgid "Required string" msgstr "要求的字串" -#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215 -#: include/classes/html/CTabFilter.php:97 +#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50 +#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97 msgid "Reset" msgstr "重設" @@ -14938,7 +14690,7 @@ msgstr "重設確認" msgid "Reset defaults" msgstr "重設預設" -#: jsLoader.php:281 +#: jsLoader.php:262 msgid "Resolved" msgstr "已解決" @@ -15004,7 +14756,7 @@ msgstr "" #: app/views/popup.itemtestedit.view.php:326 #: app/views/popup.itemtestedit.view.php:366 #: app/views/popup.testtriggerexpr.php:49 -#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216 +#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217 #: include/classes/debug/CProfiler.php:183 msgid "Result" msgstr "結果" @@ -15191,12 +14943,12 @@ msgstr "" msgid "Russian (ru_RU)" msgstr "俄語 (ru_RU)" -#: jsLoader.php:245 +#: jsLoader.php:226 msgctxt "Saturday short" msgid "S" msgstr "S" -#: jsLoader.php:246 +#: jsLoader.php:227 msgctxt "Sunday short" msgid "S" msgstr "S" @@ -15207,8 +14959,8 @@ msgstr "" #: app/partials/monitoring.service.list.edit.php:56 #: app/partials/monitoring.service.list.php:53 -#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240 -#: app/views/popup.service.edit.php:315 srv_status.php:149 +#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249 +#: app/views/popup.service.edit.php:354 msgid "SLA" msgstr "SLA" @@ -15245,7 +14997,7 @@ msgstr "" #: app/views/monitoring.widget.hostavail.view.php:28 #: include/classes/widgets/views/widget.hostavail.form.view.php:47 -#: include/hosts.inc.php:465 include/hosts.inc.php:1271 +#: include/hosts.inc.php:465 include/hosts.inc.php:1204 #: include/items.inc.php:348 #: include/views/js/configuration.host.edit.js.php:176 msgid "SNMP" @@ -15341,12 +15093,12 @@ msgstr "" msgid "SQL query" msgstr "" -#: include/classes/db/DB.php:946 +#: include/classes/db/DB.php:975 #, c-format msgid "SQL statement execution has failed \"%1$s\"" msgstr "SQL陳述式執行已失敗: \"%1$s\"" -#: include/classes/db/DB.php:614 include/classes/db/DB.php:673 +#: include/classes/db/DB.php:643 include/classes/db/DB.php:702 #, c-format msgid "SQL statement execution has failed \"%1$s\"." msgstr "SQL陳述式執行已失敗: \"%1$s\"." @@ -15409,7 +15161,7 @@ msgstr "" msgid "STARTTLS" msgstr "" -#: include/httptest.inc.php:422 +#: include/httptest.inc.php:426 msgid "Safari" msgstr "Safari" @@ -15421,7 +15173,7 @@ msgstr "" msgid "Sat" msgstr "六" -#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238 +#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219 msgid "Saturday" msgstr "週六" @@ -15463,7 +15215,7 @@ msgstr "排程" msgid "Scheduled check" msgstr "" -#: app/controllers/CControllerAuditLogList.php:234 +#: app/controllers/CControllerAuditLogList.php:235 #: app/views/reports.scheduledreport.edit.php:58 msgid "Scheduled report" msgstr "" @@ -15527,7 +15279,7 @@ msgctxt "selected problems" msgid "Scope" msgstr "" -#: app/controllers/CControllerAuditLogList.php:235 +#: app/controllers/CControllerAuditLogList.php:236 #: app/views/administration.mediatype.edit.php:218 #: app/views/administration.script.edit.php:116 #: app/views/administration.script.edit.php:186 @@ -15540,8 +15292,7 @@ msgstr "" msgid "Script" msgstr "脚本" -#: include/classes/api/services/CScript.php:320 -#: include/classes/api/services/CScript.php:561 +#: include/classes/api/services/CScript.php:1346 #, c-format msgid "Script \"%1$s\" already exists." msgstr "" @@ -15572,12 +15323,6 @@ msgstr "脚本名稱" msgid "Script parameters" msgstr "" -#: include/classes/api/services/CMediatype.php:341 -#: include/classes/api/services/CMediatype.php:667 -#, c-format -msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"." -msgstr "" - #: include/classes/debug/CProfiler.php:145 msgid "Script profiler" msgstr "腳本探查器" @@ -15590,7 +15335,7 @@ msgstr "脚本已更新" #: app/views/administration.script.edit.php:31 #: app/views/administration.script.list.php:31 #: include/classes/helpers/CMenuHelper.php:295 -#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355 +#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336 msgid "Scripts" msgstr "脚本" @@ -15660,8 +15405,8 @@ msgid "Security name" msgstr "" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 -#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93 +#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638 +#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 #: include/views/configuration.graph.edit.php:207 @@ -15669,7 +15414,7 @@ msgstr "" #: include/views/configuration.item.edit.php:101 #: include/views/configuration.item.prototype.edit.php:83 #: include/views/configuration.item.prototype.edit.php:479 -#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315 +#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296 msgid "Select" msgstr "選擇" @@ -15705,19 +15450,19 @@ msgstr "所選的組件" msgid "Selected items only" msgstr "" -#: jsLoader.php:320 +#: jsLoader.php:301 #, c-format msgctxt "screen reader" msgid "Selected, %1$s in position %2$d of %3$d" msgstr "" -#: jsLoader.php:321 +#: jsLoader.php:302 #, c-format msgctxt "screen reader" msgid "Selected, %1$s, read only, in position %2$d of %3$d" msgstr "" -#: jsLoader.php:265 +#: jsLoader.php:246 msgid "Send backward" msgstr "" @@ -15742,7 +15487,7 @@ msgstr "僅送到" msgid "Send to" msgstr "收件人" -#: jsLoader.php:266 +#: jsLoader.php:247 msgid "Send to back" msgstr "" @@ -15775,7 +15520,7 @@ msgstr "分開的" msgid "Separately" msgstr "" -#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229 +#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210 msgid "September" msgstr "九月" @@ -15806,28 +15551,28 @@ msgstr "" msgid "Server time" msgstr "伺服器時間" -#: app/controllers/CControllerAuditLogList.php:223 -#: app/controllers/CControllerPopupServiceEdit.php:146 +#: app/controllers/CControllerAuditLogList.php:224 +#: app/controllers/CControllerPopupServiceEdit.php:179 #: app/views/monitoring.service.list.edit.php:115 #: app/views/popup.mediatype.message.php:58 -#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314 +#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353 #: include/actions.inc.php:67 include/actions.inc.php:77 -#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144 +#: include/classes/helpers/CMediatypeHelper.php:96 msgid "Service" msgstr "服務" -#: include/classes/api/services/CService.php:872 +#: include/classes/api/services/CService.php:1381 #, c-format msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point." msgstr "" -#: include/classes/api/services/CService.php:926 -#: include/classes/api/services/CService.php:960 +#: include/classes/api/services/CService.php:1435 +#: include/classes/api/services/CService.php:1469 #, c-format msgid "Service \"%1$s\" cannot have problem tags and children at the same time." msgstr "" -#: include/classes/api/services/CService.php:899 +#: include/classes/api/services/CService.php:1408 #, c-format msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule." msgstr "" @@ -15837,7 +15582,7 @@ msgstr "" msgid "Service actions" msgstr "" -#: app/controllers/CControllerServiceCreate.php:169 +#: app/controllers/CControllerServiceCreate.php:173 msgid "Service created" msgstr "" @@ -15869,16 +15614,16 @@ msgstr "服務端口" msgid "Service recovery" msgstr "" -#: app/controllers/CControllerServiceTimeValidate.php:92 -#: include/classes/api/services/CService.php:1085 +#: app/controllers/CControllerServiceTimeValidate.php:96 +#: include/classes/api/services/CService.php:1603 msgid "Service start time must be less than end time." msgstr "服務的開始時間不能晚於截止時間." -#: app/views/popup.condition.common.php:154 +#: app/views/popup.condition.common.php:153 msgid "Service tag name" msgstr "" -#: app/views/popup.condition.common.php:157 +#: app/views/popup.condition.common.php:156 msgid "Service tag value" msgstr "" @@ -15886,11 +15631,11 @@ msgstr "" msgid "Service time" msgstr "" -#: app/views/popup.service.edit.php:249 +#: app/views/popup.service.edit.php:258 msgid "Service times" msgstr "服務次數" -#: app/views/popup.condition.common.php:565 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:564 include/actions.inc.php:56 msgid "Service type" msgstr "服務類型" @@ -15899,30 +15644,29 @@ msgstr "服務類型" msgid "Service update" msgstr "" -#: app/controllers/CControllerServiceUpdate.php:185 +#: app/controllers/CControllerServiceUpdate.php:189 msgid "Service updated" msgstr "服務已更新" -#: include/classes/api/services/CRole.php:520 +#: include/classes/api/services/CRole.php:536 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" -#: app/controllers/CControllerServiceListEdit.php:191 -#: app/controllers/CControllerServiceListEditRefresh.php:146 -#: app/controllers/CControllerServiceList.php:165 -#: app/controllers/CControllerServiceListRefresh.php:128 +#: app/controllers/CControllerServiceListEdit.php:177 +#: app/controllers/CControllerServiceListEditRefresh.php:151 +#: app/controllers/CControllerServiceList.php:151 +#: app/controllers/CControllerServiceListRefresh.php:133 #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 -#: app/views/popup.condition.common.php:643 +#: app/views/popup.condition.common.php:642 #: include/classes/helpers/CMenuHelper.php:74 -#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26 -#: srv_status.php:155 +#: include/classes/helpers/CRoleHelper.php:319 msgid "Services" msgstr "服務" -#: include/classes/api/services/CService.php:1010 +#: include/classes/api/services/CService.php:1528 msgid "Services form a circular dependency." msgstr "服務形成了一個循環式迴圈." @@ -15930,7 +15674,7 @@ msgstr "服務形成了一個循環式迴圈." msgid "Services updated" msgstr "" -#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503 +#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468 msgid "Session initialization error." msgstr "" @@ -15960,7 +15704,7 @@ msgstr "" msgid "Set host inventory mode" msgstr "" -#: include/classes/html/CInputSecret.php:80 jsLoader.php:387 +#: include/classes/html/CInputSecret.php:80 jsLoader.php:368 msgid "Set new value" msgstr "" @@ -15989,7 +15733,7 @@ msgstr "" msgid "Setting LDAP referrals to \"Off\" failed." msgstr "" -#: app/controllers/CControllerAuditLogList.php:236 +#: app/controllers/CControllerAuditLogList.php:237 msgid "Settings" msgstr "" @@ -15998,7 +15742,7 @@ msgstr "" #: app/partials/monitoring.host.filter.php:118 #: app/partials/monitoring.problem.filter.php:102 #: app/views/monitoring.widget.problems.view.php:62 -#: app/views/popup.condition.common.php:221 +#: app/views/popup.condition.common.php:220 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 @@ -16054,7 +15798,7 @@ msgstr "" msgid "Shared" msgstr "" -#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341 +#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322 msgid "Sharing" msgstr "" @@ -16196,7 +15940,7 @@ msgstr "當Zabbix伺服器停機時展示警告" msgid "Show working time" msgstr "展示工作時間" -#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252 +#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233 msgid "Shown" msgstr "已展示" @@ -16305,7 +16049,7 @@ msgstr "略過複製圖片\"%1$s\"到主機\"%2$s\"." msgid "Slovak (sk_SK)" msgstr "斯洛伐克(sk_SK)" -#: jsLoader.php:286 +#: jsLoader.php:267 msgid "Snooze" msgstr "Snooze" @@ -16351,7 +16095,7 @@ msgstr "" msgid "Sort entries by" msgstr "" -#: app/views/popup.service.edit.php:106 +#: app/views/popup.service.edit.php:113 msgid "Sort order (0->999)" msgstr "排序次(0->999)" @@ -16425,7 +16169,7 @@ msgstr "開始於" #: app/views/monitoring.dashboard.view.php:164 #: app/views/monitoring.dashboard.view.php:232 #: app/views/monitoring.host.dashboard.view.php:101 -#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157 +#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138 msgid "Start slideshow" msgstr "" @@ -16528,15 +16272,19 @@ msgstr "" #: include/views/configuration.item.list.php:92 #: include/views/configuration.item.list.php:171 #: include/views/configuration.triggers.list.php:82 -#: include/views/configuration.triggers.list.php:195 srv_status.php:145 +#: include/views/configuration.triggers.list.php:195 msgid "Status" msgstr "狀態" -#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285 -#: app/views/popup.services.php:59 +#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295 +#: app/views/popup.services.php:60 msgid "Status calculation rule" msgstr "" +#: app/views/popup.service.edit.php:126 +msgid "Status calculation rule and additional rules are only applicable if child services exist." +msgstr "" + #: include/views/configuration.httpconf.edit.php:206 msgid "Status codes" msgstr "狀態碼" @@ -16566,7 +16314,7 @@ msgstr "只有狀態" msgid "Status problem" msgstr "" -#: app/views/popup.service.edit.php:166 +#: app/views/popup.service.edit.php:179 msgid "Status propagation rule" msgstr "" @@ -16614,7 +16362,7 @@ msgstr "" #: app/views/monitoring.dashboard.view.php:163 #: app/views/monitoring.dashboard.view.php:233 #: app/views/monitoring.host.dashboard.view.php:100 -#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158 +#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139 msgid "Stop slideshow" msgstr "" @@ -16679,7 +16427,7 @@ msgctxt "encryption certificate" msgid "Subject" msgstr "" -#: jsLoader.php:356 +#: jsLoader.php:337 msgid "Submap" msgstr "子拓墣圖" @@ -16695,7 +16443,7 @@ msgstr "" msgid "Success Audit" msgstr "成功審計" -#: include/func.inc.php:1641 jsLoader.php:215 +#: include/func.inc.php:1641 jsLoader.php:196 msgid "Success message" msgstr "" @@ -16708,7 +16456,7 @@ msgstr "" msgid "Sun" msgstr "日" -#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239 +#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220 msgid "Sunday" msgstr "日" @@ -16800,12 +16548,12 @@ msgstr "" msgid "System uptime in seconds. Returns integer" msgstr "" -#: jsLoader.php:243 +#: jsLoader.php:224 msgctxt "Thursday short" msgid "T" msgstr "T" -#: jsLoader.php:241 +#: jsLoader.php:222 msgctxt "Tuesday short" msgid "T" msgstr "T" @@ -16832,17 +16580,17 @@ msgstr "真" msgid "Table \"%1$s\" does not exist." msgstr "資料表\"%1$s\" 不存在." -#: include/classes/db/DB.php:477 +#: include/classes/db/DB.php:497 #, c-format msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"." msgstr "資料表\"%1$s\"不能有欄位名為\"%2$s\"." #: app/controllers/CControllerPopupLldOperation.php:131 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 -#: app/views/popup.condition.common.php:74 -#: app/views/popup.condition.common.php:139 -#: app/views/popup.condition.common.php:308 -#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144 +#: app/views/popup.condition.common.php:72 +#: app/views/popup.condition.common.php:138 +#: app/views/popup.condition.common.php:307 +#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144 #: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "標簽" @@ -16898,7 +16646,7 @@ msgstr "" #: app/views/popup.massupdate.template.php:149 #: app/views/popup.massupdate.trigger.php:75 #: app/views/popup.massupdate.trigger.php:150 -#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316 +#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117 #: include/classes/screens/CScreenProblem.php:839 #: include/classes/screens/CScreenProblem.php:895 @@ -16958,7 +16706,7 @@ msgstr "目標類型" msgid "Telnet" msgstr "Telnet" -#: app/controllers/CControllerAuditLogList.php:237 +#: app/controllers/CControllerAuditLogList.php:238 #: app/views/administration.mediatype.edit.php:281 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274 #: include/actions.inc.php:49 include/forms.inc.php:529 @@ -16979,7 +16727,7 @@ msgstr "模板" msgid "Template \"%1$s\" already exists." msgstr "模板 \"%1$s\" 已存在." -#: include/classes/api/services/CHostGroup.php:1566 +#: include/classes/api/services/CHostGroup.php:1348 #: include/classes/api/services/CTemplate.php:441 #: include/classes/api/services/CTemplate.php:1154 #, c-format @@ -17003,7 +16751,7 @@ msgstr "" msgid "Template cannot be linked to another template more than once even through other templates." msgstr "模板不能重複連結到其它模板, 即使透過其它模板." -#: app/controllers/CControllerAuditLogList.php:238 +#: app/controllers/CControllerAuditLogList.php:239 msgid "Template dashboard" msgstr "" @@ -17063,7 +16811,7 @@ msgstr "" #: app/controllers/CControllerPopupImportCompare.php:165 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219 #: app/views/search.php:223 app/views/search.php:365 #: include/classes/helpers/CMenuHelper.php:153 @@ -17235,13 +16983,13 @@ msgstr "" msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed." msgstr "" -#: include/classes/api/services/CImage.php:383 +#: include/classes/api/services/CImage.php:555 #, c-format msgid "The image is used in icon map %1$s." msgid_plural "The image is used in icon maps %1$s." msgstr[0] "" -#: include/classes/api/services/CImage.php:409 +#: include/classes/api/services/CImage.php:591 #, c-format msgid "The image is used in map %1$s." msgid_plural "The image is used in maps %1$s." @@ -17305,7 +17053,7 @@ msgstr "" msgid "This is the test message from Zabbix" msgstr "" -#: include/func.inc.php:2552 srv_status.php:40 +#: include/func.inc.php:2552 msgid "This month" msgstr "本月" @@ -17313,7 +17061,7 @@ msgstr "本月" msgid "This month so far" msgstr "" -#: include/func.inc.php:2550 srv_status.php:39 +#: include/func.inc.php:2550 msgid "This week" msgstr "本周" @@ -17321,7 +17069,7 @@ msgstr "本周" msgid "This week so far" msgstr "" -#: include/func.inc.php:2554 srv_status.php:41 +#: include/func.inc.php:2554 msgid "This year" msgstr "本年" @@ -17341,7 +17089,7 @@ msgstr "" msgid "Thu" msgstr "四" -#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236 +#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217 msgid "Thursday" msgstr "週四" @@ -17358,7 +17106,7 @@ msgstr "直到" #: app/views/popup.itemtestedit.view.php:271 #: app/views/popup.service.time.edit.php:71 #: app/views/popup.service.time.edit.php:99 -#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 +#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700 #: include/actions.inc.php:1754 include/actions.inc.php:1827 #: include/actions.inc.php:1921 include/actions.inc.php:1976 @@ -17391,7 +17139,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces msgstr "" #: include/actions.inc.php:51 -#: include/classes/widgets/views/widget.svggraph.form.view.php:292 +#: include/classes/widgets/views/widget.svggraph.form.view.php:293 msgid "Time period" msgstr "時間期間" @@ -17443,12 +17191,11 @@ msgstr "時間戳" msgid "To" msgstr "到" -#: jsLoader.php:368 +#: jsLoader.php:349 msgid "To set a host interface select a single item type for all items" msgstr "要設定一個主機介面, 選擇一個單一的項目類型給所有的項目" #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548 -#: srv_status.php:38 msgid "Today" msgstr "今天" @@ -17563,7 +17310,7 @@ msgstr "" msgid "Trends" msgstr "趨勢" -#: app/controllers/CControllerAuditLogList.php:239 +#: app/controllers/CControllerAuditLogList.php:240 #: app/controllers/CControllerPopupTriggerWizard.php:282 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256 @@ -17571,7 +17318,7 @@ msgstr "趨勢" #: include/views/configuration.triggers.edit.php:571 #: include/views/js/monitoring.sysmaps.js.php:94 #: include/views/js/monitoring.sysmaps.js.php:792 -#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357 +#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338 msgid "Trigger" msgstr "觸發器" @@ -17669,7 +17416,7 @@ msgstr "觸發器名稱" msgid "Trigger overview" msgstr "觸發器概覽" -#: app/controllers/CControllerAuditLogList.php:240 +#: app/controllers/CControllerAuditLogList.php:241 #: app/views/popup.lldoperation.php:52 #: app/views/popup.massupdate.trigger.php:149 #: include/views/configuration.trigger.prototype.edit.php:548 @@ -17741,11 +17488,11 @@ msgstr "" msgid "Trigger severity" msgstr "觸發器示警度" -#: jsLoader.php:342 +#: jsLoader.php:323 msgid "Trigger status \"OK\"" msgstr "" -#: jsLoader.php:343 +#: jsLoader.php:324 msgid "Trigger status \"Problem\"" msgstr "" @@ -17762,7 +17509,7 @@ msgstr "觸發器已更新" #: app/partials/configuration.filter.items.php:191 #: app/partials/monitoring.problem.filter.php:74 #: app/partials/trigoverview.table.top.php:29 -#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308 #: app/views/search.php:313 include/html.inc.php:341 #: include/views/configuration.host.discovery.list.php:195 @@ -17797,7 +17544,7 @@ msgstr "" msgid "Tue" msgstr "二" -#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234 +#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215 msgid "Tuesday" msgstr "週二" @@ -17810,7 +17557,7 @@ msgstr "" msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict." msgstr "兩個項目 (\"%1$s\"和\"%2$s\")不能填入一個主機資產紀錄欄位\"%3$s\", 這會造成衝突." -#: jsLoader.php:260 +#: jsLoader.php:241 msgid "Two map elements should be selected" msgstr "" @@ -17826,19 +17573,19 @@ msgstr "" #: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:79 #: app/views/monitoring.widget.actionlog.view.php:35 -#: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:169 -#: app/views/popup.condition.common.php:658 +#: app/views/popup.condition.common.php:47 +#: app/views/popup.condition.common.php:168 +#: app/views/popup.condition.common.php:657 #: app/views/popup.dashboard.share.edit.php:123 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70 -#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47 +#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51 #: include/classes/widgets/CWidgetHelper.php:50 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34 -#: include/hosts.inc.php:99 include/hosts.inc.php:1287 +#: include/hosts.inc.php:99 include/hosts.inc.php:1220 #: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 @@ -17890,7 +17637,7 @@ msgstr "數據類型" msgid "Types" msgstr "類型 " -#: include/classes/api/services/CRole.php:461 +#: include/classes/api/services/CRole.php:478 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -17911,7 +17658,7 @@ msgstr "未知的" #: include/views/configuration.trigger.prototype.edit.php:530 #: include/views/configuration.triggers.edit.php:557 #: include/views/js/monitoring.sysmaps.js.php:314 -#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358 +#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339 msgid "URL" msgstr "URL" @@ -17957,12 +17704,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"." msgstr "" #: include/views/js/monitoring.sysmaps.js.php:311 -#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359 +#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340 msgid "URLs" msgstr "URLs" -#: include/classes/validators/CApiInputValidator.php:2435 -#: include/classes/validators/CApiInputValidator.php:2441 +#: include/classes/validators/CApiInputValidator.php:2533 +#: include/classes/validators/CApiInputValidator.php:2539 msgid "UUIDv4 is expected" msgstr "" @@ -18047,12 +17794,12 @@ msgstr "" msgid "Unblock selected users?" msgstr "解除封鎖所選的用戶?" -#: include/classes/core/ZBase.php:606 +#: include/classes/core/ZBase.php:571 #, c-format msgid "Unexpected response for action %1$s." msgstr "" -#: app/views/js/popup.service.edit.js.php:383 +#: app/views/js/popup.service.edit.js.php:582 #: app/views/js/popup.service.statusrule.edit.js.php:104 #: app/views/js/popup.service.time.edit.js.php:82 msgid "Unexpected server error." @@ -18072,21 +17819,23 @@ msgstr "單位" #: app/views/monitoring.widget.hostavail.view.php:66 #: app/views/monitoring.widget.hostavail.view.php:104 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118 -#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37 +#: include/actions.inc.php:1049 +#: include/classes/helpers/CCorrelationHelper.php:133 +#: include/classes/helpers/CRegexHelper.php:37 #: include/classes/helpers/CSeverityHelper.php:48 #: include/classes/html/CHostAvailability.php:79 #: include/classes/screens/CScreenHttpTestDetails.php:115 -#: include/correlation.inc.php:146 include/discovery.inc.php:115 -#: include/discovery.inc.php:151 include/events.inc.php:45 -#: include/events.inc.php:76 include/graphs.inc.php:37 -#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74 -#: include/html.inc.php:291 include/httptest.inc.php:41 -#: include/httptest.inc.php:58 include/items.inc.php:45 -#: include/items.inc.php:110 include/items.inc.php:133 -#: include/items.inc.php:167 include/maintenances.inc.php:33 -#: include/maps.inc.php:39 include/triggers.inc.php:83 -#: include/triggers.inc.php:1865 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 +#: include/discovery.inc.php:115 include/discovery.inc.php:151 +#: include/events.inc.php:45 include/events.inc.php:76 +#: include/graphs.inc.php:37 include/graphs.inc.php:67 +#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291 +#: include/httptest.inc.php:41 include/httptest.inc.php:58 +#: include/items.inc.php:45 include/items.inc.php:110 +#: include/items.inc.php:133 include/items.inc.php:167 +#: include/maintenances.inc.php:33 include/maps.inc.php:39 +#: include/triggers.inc.php:83 include/triggers.inc.php:1866 +#: include/users.inc.php:64 include/users.inc.php:87 +#: include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "未知的" @@ -18104,7 +17853,7 @@ msgid "Unknown error" msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1244 +#: app/controllers/CControllerPopupTriggerExpr.php:1251 #: include/triggers.inc.php:1146 msgid "Unknown host item, no such item in selected host" msgstr "未知的主機項目, 在所選的主機中沒有這樣的項目" @@ -18157,7 +17906,7 @@ msgstr "自模板斷連" msgid "Unlink from templates" msgstr "自模板斷連" -#: jsLoader.php:284 +#: jsLoader.php:265 msgid "Unmute" msgstr "開聲音" @@ -18187,7 +17936,7 @@ msgstr "" msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1852 +#: include/classes/api/services/CDiscoveryRule.php:1848 #, c-format msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"." msgstr "" @@ -18197,7 +17946,7 @@ msgstr "" msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1818 +#: include/classes/api/services/CDiscoveryRule.php:1814 #, c-format msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"." msgstr "" @@ -18242,7 +17991,7 @@ msgstr "上" #: app/views/administration.usergroup.edit.php:221 #: app/views/administration.userrole.edit.php:378 #: app/views/administration.user.token.edit.php:88 -#: app/views/configuration.correlation.edit.php:177 +#: app/views/configuration.correlation.edit.php:179 #: app/views/configuration.discovery.edit.php:154 #: app/views/popup.acknowledge.edit.php:115 #: app/views/popup.dashboard.share.edit.php:155 @@ -18255,7 +18004,7 @@ msgstr "上" #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127 #: app/views/popup.mediatype.message.php:104 #: app/views/popup.scheduledreport.subscription.php:133 -#: app/views/popup.service.edit.php:339 +#: app/views/popup.service.edit.php:385 #: app/views/popup.service.statusrule.edit.php:98 #: app/views/popup.service.time.edit.php:167 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126 @@ -18308,7 +18057,7 @@ msgstr "" msgid "Update problem" msgstr "" -#: app/controllers/CControllerAuditLogList.php:361 +#: app/controllers/CControllerAuditLogList.php:362 #: app/controllers/CControllerPopupImportCompare.php:160 msgid "Updated" msgstr "" @@ -18326,7 +18075,7 @@ msgstr "上傳" msgid "Upper level maps" msgstr "上層拓墣圖" -#: app/partials/service.time.row.php:28 +#: app/views/js/popup.service.edit.js.php:225 #: app/views/popup.service.time.edit.php:46 #: include/classes/screens/CScreenDiscovery.php:120 msgid "Uptime" @@ -18361,7 +18110,7 @@ msgstr "" msgid "Used in actions" msgstr "用於動作中" -#: app/controllers/CControllerAuditLogList.php:241 +#: app/controllers/CControllerAuditLogList.php:242 #: app/partials/js/scheduledreport.subscription.js.php:78 #: app/partials/popup.operations.php:105 #: app/views/administration.token.edit.php:51 @@ -18376,7 +18125,7 @@ msgstr "用於動作中" msgid "User" msgstr "用户" -#: include/classes/api/services/CUserGroup.php:623 +#: include/classes/api/services/CUserGroup.php:612 #, c-format msgid "User \"%1$s\" cannot be without user group." msgstr "" @@ -18428,7 +18177,7 @@ msgstr "新增用户" msgid "User agent string" msgstr "" -#: include/classes/api/services/CUserGroup.php:545 +#: include/classes/api/services/CUserGroup.php:534 #: include/classes/api/services/CUser.php:979 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "用戶不能將自己加進一個取消的群組或已取消圖形介面存取權的群組." @@ -18447,7 +18196,7 @@ msgid "User deleted" msgid_plural "Users deleted" msgstr[0] "用户已删除" -#: app/controllers/CControllerAuditLogList.php:242 +#: app/controllers/CControllerAuditLogList.php:243 #: app/partials/js/scheduledreport.subscription.js.php:83 #: app/partials/popup.operations.php:85 #: app/views/administration.script.edit.php:242 @@ -18457,27 +18206,27 @@ msgstr[0] "用户已删除" msgid "User group" msgstr "用户群組" -#: include/classes/api/services/CUserGroup.php:374 +#: include/classes/api/services/CUserGroup.php:363 #, c-format msgid "User group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CUserGroup.php:949 +#: include/classes/api/services/CUserGroup.php:977 #, c-format msgid "User group \"%1$s\" is report \"%2$s\" recipient." msgstr "" -#: include/classes/api/services/CUserGroup.php:914 +#: include/classes/api/services/CUserGroup.php:942 #, c-format msgid "User group \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: include/classes/api/services/CUserGroup.php:935 +#: include/classes/api/services/CUserGroup.php:963 #, c-format msgid "User group \"%1$s\" is used in configuration for database down messages." msgstr "" -#: include/classes/api/services/CUserGroup.php:927 +#: include/classes/api/services/CUserGroup.php:955 #, c-format msgid "User group \"%1$s\" is used in script \"%2$s\"." msgstr "用戶群組\"%1$s\"被用於腳本\"%2$s\"." @@ -18509,8 +18258,8 @@ msgstr[0] "" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:901 -#: include/classes/api/services/CSettings.php:249 +#: include/classes/api/services/CScript.php:776 +#: include/classes/api/services/CSettings.php:255 #: include/classes/api/services/CUser.php:741 #, c-format msgid "User group with ID \"%1$s\" is not available." @@ -18554,14 +18303,14 @@ msgstr "用戶密碼" msgid "User profile" msgstr "用戶基本資料" -#: app/controllers/CControllerAuditLogList.php:243 +#: app/controllers/CControllerAuditLogList.php:244 #: app/views/administration.user.list.php:110 #: app/views/administration.userrole.edit.php:386 #: app/views/administration.userrole.edit.php:388 msgid "User role" msgstr "" -#: include/classes/api/services/CRole.php:396 +#: include/classes/api/services/CRole.php:414 #, c-format msgid "User role \"%1$s\" already exists." msgstr "" @@ -18628,7 +18377,7 @@ msgstr "用户已更新" #: include/classes/api/services/CReport.php:405 #: include/classes/api/services/CToken.php:246 #: include/classes/api/services/CToken.php:257 -#: include/classes/api/services/CUserGroup.php:412 +#: include/classes/api/services/CUserGroup.php:401 #, c-format msgid "User with ID \"%1$s\" is not available." msgstr "" @@ -18944,14 +18693,14 @@ msgstr "" #: app/views/administration.mediatype.edit.php:155 #: app/views/administration.script.edit.php:65 #: app/views/monitoring.widget.plaintext.view.php:50 -#: app/views/popup.condition.common.php:141 -#: app/views/popup.condition.common.php:326 -#: app/views/popup.condition.common.php:373 -#: app/views/popup.condition.common.php:388 -#: app/views/popup.condition.common.php:536 -#: app/views/popup.condition.common.php:550 -#: app/views/popup.condition.common.php:581 -#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:140 +#: app/views/popup.condition.common.php:325 +#: app/views/popup.condition.common.php:372 +#: app/views/popup.condition.common.php:387 +#: app/views/popup.condition.common.php:535 +#: app/views/popup.condition.common.php:549 +#: app/views/popup.condition.common.php:580 +#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263 #: app/views/popup.lldoperation.php:268 @@ -18961,7 +18710,7 @@ msgstr "" #: app/views/popup.massupdate.service.php:50 #: app/views/popup.massupdate.template.php:140 #: app/views/popup.massupdate.trigger.php:84 -#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270 +#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309 #: include/classes/screens/CScreenHistory.php:279 @@ -19003,7 +18752,7 @@ msgstr "" msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"." msgstr "" -#: include/classes/db/DB.php:390 include/classes/db/DB.php:419 +#: include/classes/db/DB.php:390 include/classes/db/DB.php:423 #, c-format msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters." msgstr "欄位\"%2$s\"的值\"%1$s\"太長 - %3$d字元. 容許的長度是%4$d字元." @@ -19020,7 +18769,7 @@ msgstr "" msgid "Value cannot be empty." msgstr "" -#: app/controllers/CControllerAuditLogList.php:244 +#: app/controllers/CControllerAuditLogList.php:245 msgid "Value map" msgstr "值對應" @@ -19063,11 +18812,12 @@ msgstr "" msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)" msgstr "" -#: include/correlation.inc.php:166 +#: include/classes/helpers/CCorrelationHelper.php:153 msgid "Value of new event tag" msgstr "" -#: include/correlation.inc.php:151 include/correlation.inc.php:159 +#: include/classes/helpers/CCorrelationHelper.php:138 +#: include/classes/helpers/CCorrelationHelper.php:146 msgid "Value of old event tag" msgstr "" @@ -19114,7 +18864,7 @@ msgstr "" msgid "Vault authentication token" msgstr "" -#: include/classes/core/ZBase.php:234 +#: include/classes/core/ZBase.php:228 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53 msgid "Vault connection failed." msgstr "" @@ -19201,7 +18951,7 @@ msgstr "如果缺少主機名稱, 可見的名稱不能是空白." msgid "W" msgstr "" -#: jsLoader.php:242 +#: jsLoader.php:223 msgctxt "Wednesday short" msgid "W" msgstr "W" @@ -19218,7 +18968,7 @@ msgctxt "setup" msgid "Warning" msgstr "警示" -#: include/func.inc.php:1643 jsLoader.php:217 +#: include/func.inc.php:1643 jsLoader.php:198 msgid "Warning message" msgstr "" @@ -19227,7 +18977,7 @@ msgstr "" msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)" msgstr "" -#: jsLoader.php:289 +#: jsLoader.php:270 msgid "We are sorry, the maximum possible number of elements to remember has been reached." msgstr "我們很抱歉, 已經到了可記住的最大可能的組件數量." @@ -19243,7 +18993,7 @@ msgstr "我們很抱歉, 已經到了可記住的最大可能的組件數量." #: include/views/inventory.host.view.php:136 #: include/views/inventory.host.view.php:141 #: include/views/inventory.host.view.php:206 -#: include/views/inventory.host.view.php:219 jsLoader.php:360 +#: include/views/inventory.host.view.php:219 jsLoader.php:341 msgid "Web" msgstr "Web" @@ -19255,7 +19005,7 @@ msgstr "Web" msgid "Web monitoring" msgstr "Web監測" -#: app/controllers/CControllerAuditLogList.php:233 +#: app/controllers/CControllerAuditLogList.php:234 msgid "Web scenario" msgstr "" @@ -19270,25 +19020,25 @@ msgstr "主機 \"%2$s\" 上已有網頁監測情境 \"%1$s\" 了。" msgid "Web scenario \"%1$s\" already exists." msgstr "網頁監測情境 \"%1$s\" 已存在了。" -#: httpconf.php:227 +#: httpconf.php:199 msgid "Web scenario added" msgstr "" -#: httpconf.php:179 httpconf.php:502 +#: httpconf.php:179 httpconf.php:444 msgid "Web scenario deleted" msgstr "網頁監測情境已刪除" -#: httpconf.php:443 +#: httpconf.php:415 msgid "Web scenario disabled" msgid_plural "Web scenarios disabled" msgstr[0] "網頁監測情境已停用" -#: httpconf.php:442 +#: httpconf.php:414 msgid "Web scenario enabled" msgid_plural "Web scenarios enabled" msgstr[0] "網頁監測情境已啟用" -#: httpconf.php:223 +#: httpconf.php:195 msgid "Web scenario updated" msgstr "" @@ -19310,7 +19060,7 @@ msgstr "" msgid "Wed" msgstr "三" -#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235 +#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216 msgid "Wednesday" msgstr "週三" @@ -19321,7 +19071,7 @@ msgstr "週三" msgid "Weekly" msgstr "每週" -#: app/views/popup.service.edit.php:204 +#: app/views/popup.service.edit.php:217 msgid "Weight" msgstr "" @@ -19337,12 +19087,12 @@ msgstr "" msgid "When active" msgstr "當作用中時" -#: include/classes/api/services/CDashboardGeneral.php:305 +#: include/classes/api/services/CDashboardGeneral.php:346 #, c-format msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds." msgstr "" -#: jsLoader.php:184 +#: jsLoader.php:165 msgid "Widget is too small for the specified number of columns and rows." msgstr "" @@ -19537,6 +19287,10 @@ msgstr "Y-m-d H:i" msgid "Y-m-d H:i:s" msgstr "Y-m-d H:i:s" +#: include/translateDefines.inc.php:37 +msgid "Y-n-d" +msgstr "" + #: include/views/js/monitoring.sysmaps.js.php:446 msgid "Y1" msgstr "" @@ -19598,7 +19352,7 @@ msgstr "每年" #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:681 +#: app/views/popup.condition.common.php:680 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96 #: app/views/popup.massupdate.item.php:327 #: app/views/popup.massupdate.item.php:336 @@ -19655,18 +19409,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "" #: include/classes/api/services/CAuditLog.php:73 -#: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 -#: include/classes/api/services/CIconMap.php:185 -#: include/classes/api/services/CIconMap.php:256 #: include/classes/api/services/CMaintenance.php:535 #: include/classes/api/services/CMaintenance.php:956 #: include/classes/api/services/CMaintenance.php:967 #: include/classes/api/services/CModule.php:48 -#: include/classes/api/services/CScript.php:269 -#: include/classes/api/services/CScript.php:512 -#: include/classes/api/services/CScript.php:965 #: include/classes/api/services/CTask.php:49 #: include/classes/api/services/CTask.php:247 #: include/classes/api/services/CTemplate.php:477 @@ -19678,9 +19426,6 @@ msgstr "" #: include/classes/api/services/CToken.php:313 #: include/classes/api/services/CToken.php:414 #: include/classes/api/services/CToken.php:448 -#: include/classes/api/services/CUserMacro.php:271 -#: include/classes/api/services/CUserMacro.php:331 -#: include/classes/api/services/CUserMacro.php:447 msgid "You do not have permission to perform this operation." msgstr "您沒有許可權來完成此操作." @@ -19796,24 +19541,28 @@ msgstr "" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2143 +#: include/classes/validators/CApiInputValidator.php:2241 msgid "a DNS name is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:996 +#: include/classes/validators/CApiInputValidator.php:1053 msgid "a boolean is expected" msgstr "" +#: include/classes/validators/CNewValidator.php:300 +msgid "a boolean value is expected" +msgstr "" + #: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:318 +#: include/classes/validators/CApiInputValidator.php:338 #: include/classes/validators/CEventCorrCondValidator.php:91 -#: include/classes/validators/CNewValidator.php:326 +#: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2357 +#: include/classes/validators/CApiInputValidator.php:2455 msgid "a date in YYYY-MM-DD format is expected" msgstr "" @@ -19822,37 +19571,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:747 +#: include/classes/validators/CApiInputValidator.php:804 msgid "a floating point value is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:410 -#: include/classes/validators/CNewValidator.php:313 +#: include/classes/validators/CApiInputValidator.php:430 +#: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1601 +#: include/classes/validators/CApiInputValidator.php:1689 msgid "a low-level discovery macro is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1480 +#: include/classes/validators/CApiInputValidator.php:1568 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "" -#: include/classes/validators/CApiInputValidator.php:950 -#: include/classes/validators/CApiInputValidator.php:1459 -#: include/classes/validators/CApiInputValidator.php:2166 +#: include/classes/validators/CApiInputValidator.php:1007 +#: include/classes/validators/CApiInputValidator.php:1547 +#: include/classes/validators/CApiInputValidator.php:2264 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:607 -#: include/classes/validators/CApiInputValidator.php:646 -#: include/classes/validators/CApiInputValidator.php:960 -#: include/classes/validators/CApiInputValidator.php:1468 -#: include/classes/validators/CApiInputValidator.php:1475 -#: include/classes/validators/CApiInputValidator.php:1768 +#: include/classes/validators/CApiInputValidator.php:664 +#: include/classes/validators/CApiInputValidator.php:703 +#: include/classes/validators/CApiInputValidator.php:1017 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1856 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "" @@ -19873,28 +19622,29 @@ msgstr "" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2327 +#: include/classes/validators/CApiInputValidator.php:2425 msgid "a string, number or null value is expected" msgstr "" -#: include/classes/validators/CNewValidator.php:273 +#: include/classes/validators/CNewValidator.php:238 msgid "a time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1668 -#: include/classes/validators/CNewValidator.php:285 +#: include/classes/validators/CApiInputValidator.php:1756 +#: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1634 +#: include/classes/validators/CApiInputValidator.php:1722 #: include/validate.inc.php:221 msgid "a time range is expected" msgstr "" #: app/controllers/CControllerPopupHttpStep.php:94 #: app/controllers/CControllerPopupLldOperation.php:154 -#: include/classes/validators/CApiInputValidator.php:1757 -#: include/classes/validators/CNewValidator.php:552 +#: include/classes/validators/CApiInputValidator.php:1845 +#: include/classes/validators/CNewValidator.php:265 +#: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 msgid "a time unit is expected" msgstr "" @@ -19942,7 +19692,7 @@ msgstr "所有" msgid "all media" msgstr "所有媒體" -#: include/classes/validators/CApiInputValidator.php:2063 +#: include/classes/validators/CApiInputValidator.php:2161 msgid "an IP address is expected" msgstr "" @@ -19950,42 +19700,37 @@ msgstr "" #: include/classes/api/services/CDRule.php:481 #: include/classes/api/services/CItemGeneral.php:2542 #: include/classes/api/services/CItemGeneral.php:2564 -#: include/classes/import/validators/C44XmlValidator.php:2093 -#: include/classes/import/validators/C44XmlValidator.php:2113 -#: include/classes/import/validators/C44XmlValidator.php:2240 -#: include/classes/import/validators/C50XmlValidator.php:2236 -#: include/classes/import/validators/C50XmlValidator.php:2256 -#: include/classes/import/validators/C50XmlValidator.php:2383 -#: include/classes/import/validators/C52XmlValidator.php:2401 -#: include/classes/import/validators/C52XmlValidator.php:2421 -#: include/classes/import/validators/C52XmlValidator.php:2548 -#: include/classes/import/validators/C52XmlValidator.php:2587 -#: include/classes/import/validators/C54XmlValidator.php:2456 -#: include/classes/import/validators/C54XmlValidator.php:2476 -#: include/classes/import/validators/C54XmlValidator.php:2561 -#: include/classes/import/validators/C54XmlValidator.php:2600 -#: include/classes/import/validators/C60XmlValidator.php:2457 -#: include/classes/import/validators/C60XmlValidator.php:2477 -#: include/classes/import/validators/C60XmlValidator.php:2562 -#: include/classes/import/validators/C60XmlValidator.php:2601 +#: include/classes/import/validators/C44XmlValidator.php:2095 +#: include/classes/import/validators/C44XmlValidator.php:2115 +#: include/classes/import/validators/C50XmlValidator.php:2238 +#: include/classes/import/validators/C50XmlValidator.php:2258 +#: include/classes/import/validators/C52XmlValidator.php:2403 +#: include/classes/import/validators/C52XmlValidator.php:2423 +#: include/classes/import/validators/C52XmlValidator.php:2572 +#: include/classes/import/validators/C54XmlValidator.php:2458 +#: include/classes/import/validators/C54XmlValidator.php:2478 +#: include/classes/import/validators/C54XmlValidator.php:2585 +#: include/classes/import/validators/C60XmlValidator.php:2459 +#: include/classes/import/validators/C60XmlValidator.php:2479 +#: include/classes/import/validators/C60XmlValidator.php:2586 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:555 -#: include/classes/validators/CApiInputValidator.php:687 -#: include/classes/validators/CApiInputValidator.php:785 -#: include/classes/validators/CApiInputValidator.php:904 -#: include/classes/validators/CApiInputValidator.php:1052 -#: include/classes/validators/CApiInputValidator.php:1250 -#: include/classes/validators/CApiInputValidator.php:1294 -#: include/classes/validators/CApiInputValidator.php:2474 +#: include/classes/validators/CApiInputValidator.php:612 +#: include/classes/validators/CApiInputValidator.php:744 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:961 +#: include/classes/validators/CApiInputValidator.php:1109 +#: include/classes/validators/CApiInputValidator.php:1338 +#: include/classes/validators/CApiInputValidator.php:1382 +#: include/classes/validators/CApiInputValidator.php:2572 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1135 -#: include/classes/validators/CApiInputValidator.php:1205 +#: include/classes/validators/CApiInputValidator.php:1223 +#: include/classes/validators/CApiInputValidator.php:1293 msgid "an array or a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2307 +#: include/classes/validators/CApiInputValidator.php:2405 msgid "an array or object is expected" msgstr "" @@ -19995,7 +19740,7 @@ msgid "an empty string is expected" msgstr "" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1168 +#: include/classes/validators/CApiInputValidator.php:1256 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -20003,11 +19748,15 @@ msgstr "" msgid "an explicit time is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:602 +#: include/classes/api/services/CCorrelation.php:730 +msgid "an identifier is not defined in the formula" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:659 msgid "an integer is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:641 +#: include/classes/validators/CApiInputValidator.php:698 msgid "an unsigned integer is expected" msgstr "" @@ -20168,14 +19917,8 @@ msgstr "" #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:1793 -#: include/classes/api/services/CAutoregistration.php:153 -#: include/classes/api/services/CCorrelation.php:1052 -#: include/classes/api/services/CCorrelation.php:1087 -#: include/classes/api/services/CCorrelation.php:1108 -#: include/classes/api/services/CCorrelation.php:1125 -#: include/classes/api/services/CCorrelation.php:1144 -#: include/classes/api/services/CCorrelation.php:1158 -#: include/classes/api/services/CDiscoveryRule.php:1993 +#: include/classes/api/services/CAutoregistration.php:163 +#: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 #: include/classes/api/services/CDRule.php:326 @@ -20205,19 +19948,11 @@ msgstr "" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CMediatype.php:378 -#: include/classes/api/services/CMediatype.php:397 -#: include/classes/api/services/CMediatype.php:413 -#: include/classes/api/services/CMediatype.php:489 -#: include/classes/api/services/CMediatype.php:705 -#: include/classes/api/services/CMediatype.php:731 -#: include/classes/api/services/CMediatype.php:748 -#: include/classes/api/services/CMediatype.php:800 -#: include/classes/api/services/CProxy.php:700 -#: include/classes/api/services/CProxy.php:774 +#: include/classes/api/services/CProxy.php:725 +#: include/classes/api/services/CProxy.php:799 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 -#: include/classes/api/services/CUserGroup.php:473 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/api/services/CUser.php:759 #: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:744 @@ -20237,14 +19972,14 @@ msgstr "" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:328 -#: include/classes/validators/CApiInputValidator.php:560 -#: include/classes/validators/CApiInputValidator.php:692 -#: include/classes/validators/CApiInputValidator.php:790 -#: include/classes/validators/CApiInputValidator.php:909 -#: include/classes/validators/CApiInputValidator.php:955 -#: include/classes/validators/CApiInputValidator.php:1255 -#: include/classes/validators/CApiInputValidator.php:1299 +#: include/classes/validators/CApiInputValidator.php:348 +#: include/classes/validators/CApiInputValidator.php:617 +#: include/classes/validators/CApiInputValidator.php:749 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:1012 +#: include/classes/validators/CApiInputValidator.php:1343 +#: include/classes/validators/CApiInputValidator.php:1387 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20252,7 +19987,7 @@ msgstr "" #: include/classes/validators/CEventCorrCondValidator.php:80 #: include/classes/validators/CEventCorrCondValidator.php:87 #: include/classes/validators/CEventCorrCondValidator.php:96 -#: include/classes/validators/CNewValidator.php:97 +#: include/classes/validators/CNewValidator.php:103 #: include/validate.inc.php:330 msgid "cannot be empty" msgstr "" @@ -20265,7 +20000,7 @@ msgstr "" msgid "cannot perform Scroll API request, data could be truncated" msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1976 +#: include/classes/api/services/CDiscoveryRule.php:1972 msgid "cannot update property for templated discovery rule" msgstr "" @@ -20299,7 +20034,7 @@ msgstr "" msgid "circular item dependency is not allowed" msgstr "" -#: jsLoader.php:292 +#: jsLoader.php:273 msgid "color" msgstr "" @@ -20317,7 +20052,8 @@ msgid "configure" msgstr "" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 +#: include/classes/helpers/CCorrelationHelper.php:36 +#: include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "" @@ -20346,7 +20082,7 @@ msgstr "" msgid "countunique() - The number of unique values" msgstr "" -#: include/func.inc.php:579 jsLoader.php:211 +#: include/func.inc.php:579 jsLoader.php:192 msgctxt "day short" msgid "d" msgstr "d" @@ -20408,7 +20144,7 @@ msgstr "" msgid "description" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1539 +#: include/classes/validators/CApiInputValidator.php:1627 msgid "directory cannot be empty" msgstr "" @@ -20430,13 +20166,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored" msgstr "" #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27 -#: include/correlation.inc.php:34 +#: include/classes/helpers/CCorrelationHelper.php:37 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172 msgid "does not contain" msgstr "" #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25 -#: include/correlation.inc.php:32 +#: include/classes/helpers/CCorrelationHelper.php:35 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170 msgid "does not equal" msgstr "" @@ -20462,7 +20198,8 @@ msgid "e() - Returns Euler's number" msgstr "" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 -#: include/actions.inc.php:24 include/correlation.inc.php:31 +#: include/actions.inc.php:24 +#: include/classes/helpers/CCorrelationHelper.php:34 #: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" @@ -20499,6 +20236,10 @@ msgstr "" msgid "failed to parse JSON" msgstr "" +#: include/classes/validators/CApiInputValidator.php:2675 +msgid "file format is unsupported" +msgstr "" + #: app/controllers/CControllerPopupTriggerExpr.php:579 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)" msgstr "" @@ -20545,7 +20286,7 @@ msgstr "清除數據之全域設定" msgid "graph pattern" msgstr "" -#: include/func.inc.php:580 jsLoader.php:212 +#: include/func.inc.php:580 jsLoader.php:193 msgctxt "hour short" msgid "h" msgstr "h" @@ -20586,6 +20327,11 @@ msgstr "圖示" msgid "image" msgstr "圖片" +#: include/classes/validators/CApiInputValidator.php:2669 +#, c-format +msgid "image size must be less than %1$s" +msgstr "" + #: include/actions.inc.php:28 msgid "in" msgstr "在" @@ -20626,15 +20372,19 @@ msgstr "" msgid "incorrect expression starting from \"%1$s\"" msgstr "" +#: include/classes/api/services/CCorrelation.php:723 +msgid "incorrect number of conditions" +msgstr "" + #: include/classes/parsers/CParser.php:118 #, c-format msgid "incorrect syntax near \"%1$s\"" msgstr "接近 \"%1$s\\ 處語法錯誤" -#: include/classes/validators/CExpressionValidator.php:123 -#: include/classes/validators/CExpressionValidator.php:147 -#: include/classes/validators/CExpressionValidator.php:164 -#: include/classes/validators/CExpressionValidator.php:194 +#: include/classes/validators/CExpressionValidator.php:140 +#: include/classes/validators/CExpressionValidator.php:156 +#: include/classes/validators/CExpressionValidator.php:172 +#: include/classes/validators/CExpressionValidator.php:197 #, c-format msgid "incorrect usage of function \"%1$s\"" msgstr "" @@ -20662,7 +20412,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:323 +#: include/classes/validators/CApiInputValidator.php:343 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -20691,27 +20441,27 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1359 +#: include/classes/validators/CApiInputValidator.php:1447 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1403 +#: include/classes/validators/CApiInputValidator.php:1491 msgid "invalid host name" msgstr "" #: include/classes/validators/CHistFunctionValidator.php:80 -#: include/classes/validators/CMathFunctionValidator.php:72 +#: include/classes/validators/CMathFunctionValidator.php:86 #, c-format msgid "invalid number of parameters in function \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2503 msgid "invalid range expression" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1704 +#: include/classes/validators/CApiInputValidator.php:1792 msgid "invalid regular expression" msgstr "" @@ -20739,7 +20489,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1982 +#: include/classes/validators/CApiInputValidator.php:2080 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -20825,12 +20575,12 @@ msgstr "低階探索規則" msgid "ltrim() - Remove specified characters from the beginning of a string" msgstr "" -#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377 +#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358 msgctxt "minute short" msgid "m" msgstr "m" -#: include/func.inc.php:578 jsLoader.php:210 +#: include/func.inc.php:578 jsLoader.php:191 msgctxt "month short" msgid "m" msgstr "m" @@ -20889,7 +20639,7 @@ msgstr "符合的" msgid "max" msgstr "最大" -#: include/classes/api/services/CSettings.php:271 +#: include/classes/api/services/CSettings.php:277 msgid "max period is less than time filter default period" msgstr "" @@ -20929,7 +20679,7 @@ msgid "min() - Minimum value for period T" msgstr "" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1162 +#: include/classes/validators/CApiInputValidator.php:1250 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -20956,8 +20706,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "毫秒" -#: include/classes/validators/CApiInputValidator.php:2430 -#: include/classes/validators/CApiInputValidator.php:2508 +#: include/classes/validators/CApiInputValidator.php:2528 +#: include/classes/validators/CApiInputValidator.php:2606 #, c-format msgid "must be %1$s characters long" msgstr "" @@ -20972,27 +20722,14 @@ msgstr "必需為一個正確的LDAP用戶" msgid "must be at least %1$d characters long" msgstr "" -#: include/classes/api/services/CMediatype.php:388 -#: include/classes/api/services/CMediatype.php:404 -#: include/classes/api/services/CMediatype.php:422 -#: include/classes/api/services/CMediatype.php:428 -#: include/classes/api/services/CMediatype.php:715 -#: include/classes/api/services/CMediatype.php:722 -#: include/classes/api/services/CMediatype.php:738 -#: include/classes/api/services/CMediatype.php:757 -#: include/classes/api/services/CMediatype.php:763 -#, c-format -msgid "must be between \"%1$s\" and \"%2$s\"" -msgstr "" - #: app/views/administration.authentication.edit.php:56 #: app/views/administration.user.edit.php:134 #: include/classes/validators/CPasswordComplexityValidator.php:88 msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1366 -#: include/classes/validators/CApiInputValidator.php:1410 +#: include/classes/validators/CApiInputValidator.php:1454 +#: include/classes/validators/CApiInputValidator.php:1498 msgid "must contain at least one low-level discovery macro" msgstr "" @@ -21020,6 +20757,14 @@ msgstr "" msgid "must not contain user's name, surname or username" msgstr "" +#: include/translateDefines.inc.php:38 +msgid "n-d" +msgstr "" + +#: include/translateDefines.inc.php:36 +msgid "n-d H:i" +msgstr "" + #: include/views/configuration.host.discovery.edit.php:182 #: include/views/configuration.host.discovery.edit.php:320 #: include/views/configuration.item.edit.php:218 @@ -21030,7 +20775,7 @@ msgstr "" msgid "name" msgstr "" -#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314 +#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295 msgid "new" msgstr "新的" @@ -21165,7 +20910,7 @@ msgstr "" msgid "path/to/secret" msgstr "" -#: include/classes/html/CMacroValue.php:139 jsLoader.php:388 +#: include/classes/html/CMacroValue.php:139 jsLoader.php:369 msgid "path/to/secret:key" msgstr "" @@ -21200,24 +20945,28 @@ msgstr "" msgid "rand() - A random integer value" msgstr "" -#: include/classes/api/services/CService.php:1822 +#: app/controllers/CControllerPopupTriggerExpr.php:847 +msgid "rate() - Returns per-second average rate for monotonically increasing counters" +msgstr "" + +#: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" msgstr "" -#: include/classes/api/services/CService.php:476 +#: include/classes/api/services/CService.php:497 #, c-format msgid "read-write access to the child service \"%1$s\" must be retained" msgstr "" -#: include/classes/api/services/CService.php:463 -#: include/classes/api/services/CService.php:1739 -#: include/classes/api/services/CService.php:1799 +#: include/classes/api/services/CService.php:484 +#: include/classes/api/services/CService.php:2260 +#: include/classes/api/services/CService.php:2320 msgid "read-write access to the service is required" msgstr "" -#: include/classes/api/services/CService.php:1798 -#: include/classes/api/services/CService.php:1860 +#: include/classes/api/services/CService.php:2319 +#: include/classes/api/services/CService.php:2381 msgid "read-write access to the service must be retained" msgstr "" @@ -21245,11 +20994,11 @@ msgstr "" msgid "regular expression" msgstr "正則表示式" -#: app/controllers/CControllerPopupTriggerExpr.php:847 +#: app/controllers/CControllerPopupTriggerExpr.php:854 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:867 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "" @@ -21261,15 +21010,15 @@ msgstr "" msgid "right" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:878 +#: app/controllers/CControllerPopupTriggerExpr.php:885 msgid "right() - Returns the rightmost count characters" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:891 +#: app/controllers/CControllerPopupTriggerExpr.php:898 msgid "round() - Rounds a value to decimal places" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:904 +#: app/controllers/CControllerPopupTriggerExpr.php:911 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "" @@ -21317,7 +21066,7 @@ msgstr "" msgid "short description" msgstr "簡述" -#: include/classes/api/services/CAutoregistration.php:160 +#: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CHost.php:1811 #: include/classes/api/services/CHost.php:1817 #: include/classes/api/services/CHost.php:1826 @@ -21336,15 +21085,15 @@ msgstr "簡述" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CMediatype.php:793 -#: include/classes/api/services/CProxy.php:651 #: include/classes/api/services/CProxy.php:676 -#: include/classes/api/services/CProxy.php:783 -#: include/classes/api/services/CProxy.php:795 +#: include/classes/api/services/CProxy.php:701 +#: include/classes/api/services/CProxy.php:808 +#: include/classes/api/services/CProxy.php:820 #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 +#: include/classes/validators/CApiInputValidator.php:1117 msgid "should be empty" msgstr "" @@ -21360,31 +21109,31 @@ msgstr "展示圖示對應" msgid "sign in as guest" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:917 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:924 +#: app/controllers/CControllerPopupTriggerExpr.php:931 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:931 +#: app/controllers/CControllerPopupTriggerExpr.php:938 msgid "sinh() - The hyperbolic sine of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:938 +#: app/controllers/CControllerPopupTriggerExpr.php:945 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:945 +#: app/controllers/CControllerPopupTriggerExpr.php:952 msgid "sqrt() - Square root of a value" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:952 +#: app/controllers/CControllerPopupTriggerExpr.php:959 msgid "stddevpop() - Population standard deviation" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:959 +#: app/controllers/CControllerPopupTriggerExpr.php:966 msgid "stddevsamp() - Sample standard deviation" msgstr "" @@ -21392,11 +21141,11 @@ msgstr "" msgid "sum" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:966 +#: app/controllers/CControllerPopupTriggerExpr.php:973 msgid "sum() - Sum of values of a period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:973 +#: app/controllers/CControllerPopupTriggerExpr.php:980 msgid "sumofsquares() - The sum of squares" msgstr "" @@ -21412,8 +21161,8 @@ msgstr "" #: app/views/administration.usergroup.edit.php:182 #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 -#: app/views/popup.service.edit.php:84 -#: include/classes/api/services/CUserGroup.php:473 +#: app/views/popup.service.edit.php:89 +#: include/classes/api/services/CUserGroup.php:462 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:506 @@ -21424,7 +21173,7 @@ msgstr "" msgid "tag" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:980 +#: app/controllers/CControllerPopupTriggerExpr.php:987 msgid "tan() - The tangent of a value" msgstr "" @@ -21433,13 +21182,17 @@ msgstr "" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "模板ID\"%1$s\"已傳送%2$s次" -#: app/controllers/CControllerDashboardUpdate.php:188 -#: app/controllers/CControllerDashboardUpdate.php:197 -#: app/controllers/CControllerDashboardUpdate.php:209 -#: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CDiscoveryRule.php:1650 -#: include/classes/api/services/CDiscoveryRule.php:2011 -#: include/classes/api/services/CDiscoveryRule.php:2019 +#: include/classes/validators/CApiInputValidator.php:2708 +msgid "the last new line feed is missing" +msgstr "" + +#: app/controllers/CControllerDashboardUpdate.php:192 +#: app/controllers/CControllerDashboardUpdate.php:201 +#: app/controllers/CControllerDashboardUpdate.php:213 +#: include/classes/api/services/CAutoregistration.php:157 +#: include/classes/api/services/CDiscoveryRule.php:1646 +#: include/classes/api/services/CDiscoveryRule.php:2007 +#: include/classes/api/services/CDiscoveryRule.php:2015 #: include/classes/api/services/CHostBase.php:523 #: include/classes/api/services/CHost.php:1907 #: include/classes/api/services/CHost.php:2140 @@ -21448,20 +21201,20 @@ msgstr "模板ID\"%1$s\"已傳送%2$s次" #: include/classes/api/services/CHostPrototype.php:1688 #: include/classes/api/services/CHostPrototype.php:1700 #: include/classes/api/services/CHttpTest.php:744 -#: include/classes/api/services/CProxy.php:683 -#: include/classes/api/services/CProxy.php:694 -#: include/classes/api/services/CProxy.php:768 +#: include/classes/api/services/CProxy.php:708 +#: include/classes/api/services/CProxy.php:719 +#: include/classes/api/services/CProxy.php:793 #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:1025 +#: include/classes/api/services/CScript.php:902 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1091 +#: include/classes/validators/CApiInputValidator.php:1179 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -21493,39 +21246,39 @@ msgstr "" msgid "third parameter is expected" msgstr "" -#: include/classes/api/services/CSettings.php:267 +#: include/classes/api/services/CSettings.php:273 msgid "time filter default period exceeds the max period" msgstr "" -#: jsLoader.php:293 +#: jsLoader.php:274 msgid "time shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:987 +#: app/controllers/CControllerPopupTriggerExpr.php:994 msgid "time() - Current time" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:993 +#: app/controllers/CControllerPopupTriggerExpr.php:1000 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1000 +#: app/controllers/CControllerPopupTriggerExpr.php:1007 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1007 +#: app/controllers/CControllerPopupTriggerExpr.php:1014 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1014 +#: app/controllers/CControllerPopupTriggerExpr.php:1021 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1021 +#: app/controllers/CControllerPopupTriggerExpr.php:1028 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1028 +#: app/controllers/CControllerPopupTriggerExpr.php:1035 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "" @@ -21539,7 +21292,7 @@ msgstr "觸發器" msgid "trigger does not allow manual closing" msgstr "" -#: include/classes/validators/CExpressionValidator.php:100 +#: include/classes/validators/CExpressionValidator.php:116 msgid "trigger expression must contain at least one /host/key reference" msgstr "" @@ -21551,26 +21304,26 @@ msgstr "" msgid "trigger with linkages cannot be moved to another template or host" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1035 +#: app/controllers/CControllerPopupTriggerExpr.php:1042 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1048 +#: app/controllers/CControllerPopupTriggerExpr.php:1055 msgid "truncate() - Truncates a value to decimal places" msgstr "" #: app/partials/layout.htmlpage.aside.php:74 -#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313 +#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294 msgid "type here to search" msgstr "於此輸入搜尋條件" -#: include/classes/validators/CApiInputValidator.php:2019 +#: include/classes/validators/CApiInputValidator.php:2117 msgid "unacceptable URL" msgstr "" -#: include/classes/import/validators/C44XmlValidator.php:2180 -#: include/classes/import/validators/C50XmlValidator.php:2323 -#: include/classes/import/validators/C52XmlValidator.php:2488 +#: include/classes/import/validators/C44XmlValidator.php:2182 +#: include/classes/import/validators/C50XmlValidator.php:2325 +#: include/classes/import/validators/C52XmlValidator.php:2490 #: include/classes/import/validators/CXmlValidatorGeneral.php:298 #, c-format msgid "unexpected constant \"%1$s\"" @@ -21578,11 +21331,11 @@ msgstr "" #: include/classes/export/CConfigurationExportBuilder.php:119 #: include/classes/import/converters/CConstantImportConverter.php:60 -#: include/classes/import/validators/C44XmlValidator.php:2138 -#: include/classes/import/validators/C50XmlValidator.php:2281 -#: include/classes/import/validators/C52XmlValidator.php:2446 -#: include/classes/import/validators/C54XmlValidator.php:2501 -#: include/classes/import/validators/C60XmlValidator.php:2502 +#: include/classes/import/validators/C44XmlValidator.php:2140 +#: include/classes/import/validators/C50XmlValidator.php:2283 +#: include/classes/import/validators/C52XmlValidator.php:2448 +#: include/classes/import/validators/C54XmlValidator.php:2503 +#: include/classes/import/validators/C60XmlValidator.php:2504 #, c-format msgid "unexpected constant value \"%1$s\"" msgstr "" @@ -21599,10 +21352,10 @@ msgstr "鍵值有非預期的結尾" msgid "unexpected end of macro" msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1670 -#: include/classes/api/services/CDiscoveryRule.php:1702 -#: include/classes/api/services/CDiscoveryRule.php:1725 -#: include/classes/api/services/CDiscoveryRule.php:1744 +#: include/classes/api/services/CDiscoveryRule.php:1666 +#: include/classes/api/services/CDiscoveryRule.php:1698 +#: include/classes/api/services/CDiscoveryRule.php:1721 +#: include/classes/api/services/CDiscoveryRule.php:1740 #: include/classes/api/services/CGraphGeneral.php:627 #: include/classes/api/services/CGraphGeneral.php:749 #: include/classes/api/services/CHostPrototype.php:325 @@ -21612,11 +21365,12 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:1031 +#: include/classes/api/services/CScript.php:908 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1061 +#: include/classes/validators/CApiInputValidator.php:1123 +#: include/classes/validators/CApiInputValidator.php:1138 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -21642,8 +21396,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:1622 #: include/classes/api/services/CItemGeneral.php:1648 #: include/classes/api/services/CItemGeneral.php:1685 -#: include/classes/api/services/CProxy.php:738 -#: include/classes/api/services/CProxy.php:755 +#: include/classes/api/services/CProxy.php:763 +#: include/classes/api/services/CProxy.php:780 #: include/classes/api/services/CTriggerGeneral.php:821 #, c-format msgid "unexpected value \"%1$s\"" @@ -21668,6 +21422,10 @@ msgstr "" msgid "unsupported version number" msgstr "" +#: include/classes/validators/CApiInputValidator.php:491 +msgid "uppercase identifier expected" +msgstr "" + #: app/partials/configuration.tags.tab.php:67 #: app/partials/monitoring.host.filter.php:57 #: app/partials/monitoring.host.filter.php:206 @@ -21683,7 +21441,7 @@ msgstr "" #: app/views/js/popup.valuemap.edit.js.php:31 #: app/views/js/popup.valuemap.edit.js.php:32 #: app/views/popup.itemtestedit.view.php:83 -#: app/views/popup.service.edit.php:95 +#: app/views/popup.service.edit.php:102 #: include/classes/helpers/CTagFilterFieldHelper.php:78 #: include/classes/helpers/CTagFilterFieldHelper.php:131 #: include/classes/html/CMacroValue.php:131 @@ -21703,11 +21461,11 @@ msgstr "" #: include/views/js/configuration.httpconf.edit.js.php:73 #: include/views/js/configuration.maintenance.edit.js.php:37 #: include/views/js/configuration.maintenance.edit.js.php:61 -#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389 +#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370 msgid "value" msgstr "值" -#: include/classes/api/services/CDiscoveryRule.php:1890 +#: include/classes/api/services/CDiscoveryRule.php:1886 #, c-format msgid "value \"%1$s\" already exists" msgstr "" @@ -21725,76 +21483,83 @@ msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1802 -#: include/classes/validators/CApiInputValidator.php:1892 +#: include/classes/validators/CApiInputValidator.php:1890 +#: include/classes/validators/CApiInputValidator.php:1980 #, c-format msgid "value %1$s already exists" msgstr "" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:355 -#: include/classes/validators/CApiInputValidator.php:523 -#: include/classes/validators/CApiInputValidator.php:1174 -#: include/classes/validators/CApiInputValidator.php:1304 -#: include/classes/validators/CApiInputValidator.php:1350 -#: include/classes/validators/CApiInputValidator.php:1393 -#: include/classes/validators/CApiInputValidator.php:1447 -#: include/classes/validators/CApiInputValidator.php:1522 -#: include/classes/validators/CApiInputValidator.php:1565 -#: include/classes/validators/CApiInputValidator.php:1596 -#: include/classes/validators/CApiInputValidator.php:1627 -#: include/classes/validators/CApiInputValidator.php:1661 -#: include/classes/validators/CApiInputValidator.php:1695 -#: include/classes/validators/CApiInputValidator.php:1741 -#: include/classes/validators/CApiInputValidator.php:1977 -#: include/classes/validators/CApiInputValidator.php:2009 -#: include/classes/validators/CApiInputValidator.php:2051 -#: include/classes/validators/CApiInputValidator.php:2093 -#: include/classes/validators/CApiInputValidator.php:2132 -#: include/classes/validators/CApiInputValidator.php:2181 -#: include/classes/validators/CApiInputValidator.php:2234 -#: include/classes/validators/CApiInputValidator.php:2278 -#: include/classes/validators/CApiInputValidator.php:2398 -#: include/classes/validators/CApiInputValidator.php:2538 +#: include/classes/validators/CApiInputValidator.php:375 +#: include/classes/validators/CApiInputValidator.php:455 +#: include/classes/validators/CApiInputValidator.php:486 +#: include/classes/validators/CApiInputValidator.php:580 +#: include/classes/validators/CApiInputValidator.php:1262 +#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:1438 +#: include/classes/validators/CApiInputValidator.php:1481 +#: include/classes/validators/CApiInputValidator.php:1535 +#: include/classes/validators/CApiInputValidator.php:1610 +#: include/classes/validators/CApiInputValidator.php:1653 +#: include/classes/validators/CApiInputValidator.php:1684 +#: include/classes/validators/CApiInputValidator.php:1715 +#: include/classes/validators/CApiInputValidator.php:1749 +#: include/classes/validators/CApiInputValidator.php:1783 +#: include/classes/validators/CApiInputValidator.php:1829 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2107 +#: include/classes/validators/CApiInputValidator.php:2149 +#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2230 +#: include/classes/validators/CApiInputValidator.php:2279 +#: include/classes/validators/CApiInputValidator.php:2332 +#: include/classes/validators/CApiInputValidator.php:2376 +#: include/classes/validators/CApiInputValidator.php:2496 +#: include/classes/validators/CApiInputValidator.php:2636 +#: include/classes/validators/CApiInputValidator.php:2703 msgid "value is too long" msgstr "" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 +#: include/classes/validators/CApiInputValidator.php:561 +#: include/classes/validators/CApiInputValidator.php:903 #, c-format msgid "value must be %1$s" -msgstr "" +msgid_plural "value must be one of %1$s" +msgstr[0] "" -#: include/classes/validators/CApiInputValidator.php:2363 +#: include/classes/validators/CApiInputValidator.php:2461 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:514 +#: include/classes/validators/CApiInputValidator.php:571 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:511 +#: include/classes/validators/CApiInputValidator.php:566 #, c-format -msgid "value must be empty or one of %1$s" -msgstr "" +msgid "value must be empty or %1$s" +msgid_plural "value must be empty or one of %1$s" +msgstr[0] "" -#: include/classes/validators/CNewValidator.php:230 +#: include/classes/validators/CNewValidator.php:208 #, c-format msgid "value must be no greater than \"%1$s\"" msgstr "" -#: include/classes/validators/CNewValidator.php:214 +#: include/classes/validators/CNewValidator.php:196 #, c-format msgid "value must be no less than \"%1$s\"" msgstr "" #: app/controllers/CControllerPopupHttpStep.php:101 -#: include/classes/api/services/CDiscoveryRule.php:1683 -#: include/classes/api/services/CDiscoveryRule.php:1714 -#: include/classes/api/services/CDiscoveryRule.php:1734 -#: include/classes/api/services/CDiscoveryRule.php:1756 +#: include/classes/api/services/CDiscoveryRule.php:1679 +#: include/classes/api/services/CDiscoveryRule.php:1710 +#: include/classes/api/services/CDiscoveryRule.php:1730 +#: include/classes/api/services/CDiscoveryRule.php:1752 #: include/classes/api/services/CEvent.php:780 #: include/classes/api/services/CHost.php:923 #: include/classes/api/services/CHost.php:1969 @@ -21806,18 +21571,16 @@ msgstr "" #: include/classes/api/services/CMap.php:1158 #: include/classes/api/services/CReport.php:201 #: include/classes/api/services/CReport.php:597 -#: include/classes/import/validators/C52XmlValidator.php:2582 -#: include/classes/import/validators/C54XmlValidator.php:2595 -#: include/classes/import/validators/C60XmlValidator.php:2596 -#: include/classes/validators/CApiInputValidator.php:508 -#: include/classes/validators/CApiInputValidator.php:847 -#: include/classes/validators/CNewValidator.php:545 +#: include/classes/import/validators/C52XmlValidator.php:2567 +#: include/classes/import/validators/C54XmlValidator.php:2580 +#: include/classes/import/validators/C60XmlValidator.php:2581 +#: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "" -#: include/classes/validators/CApiInputValidator.php:872 +#: include/classes/validators/CApiInputValidator.php:929 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -21826,7 +21589,7 @@ msgstr "" msgid "value of first parameter is too long" msgstr "" -#: include/correlation.inc.php:154 +#: include/classes/helpers/CCorrelationHelper.php:141 msgid "value of new event tag" msgstr "" @@ -21839,11 +21602,11 @@ msgstr "" msgid "value of third parameter must be one of %1$s" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1061 +#: app/controllers/CControllerPopupTriggerExpr.php:1068 msgid "varpop() - Population variance" msgstr "" -#: app/controllers/CControllerPopupTriggerExpr.php:1068 +#: app/controllers/CControllerPopupTriggerExpr.php:1075 msgid "varsamp() - Sample variance" msgstr "" @@ -21860,7 +21623,7 @@ msgstr "" msgid "wrong item type" msgstr "" -#: include/func.inc.php:577 jsLoader.php:209 +#: include/func.inc.php:577 jsLoader.php:190 msgctxt "year short" msgid "y" msgstr "y" |