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

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'ui/locale/ja/LC_MESSAGES/frontend.po')
-rw-r--r--ui/locale/ja/LC_MESSAGES/frontend.po2947
1 files changed, 1356 insertions, 1591 deletions
diff --git a/ui/locale/ja/LC_MESSAGES/frontend.po b/ui/locale/ja/LC_MESSAGES/frontend.po
index d63a5343701..5e5da154d3a 100644
--- a/ui/locale/ja/LC_MESSAGES/frontend.po
+++ b/ui/locale/ja/LC_MESSAGES/frontend.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
-"PO-Revision-Date: 2021-09-11 16:40+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
+"PO-Revision-Date: 2021-10-17 13:40+0300\n"
"Last-Translator: Atsushi <a.tanaka77@gmail.com>\n"
"Language-Team: Zabbix\n"
"Language: ja\n"
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.5.1.3\n"
"X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1631371248.000000\n"
+"X-POOTLE-MTIME: 1634470859.000000\n"
#: include/classes/db/MysqlDbBackend.php:70
#: include/classes/db/OracleDbBackend.php:142
@@ -93,7 +93,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"
@@ -171,7 +171,7 @@ msgstr[0] "メッセージ%1$s件"
#: 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"
@@ -183,7 +183,7 @@ msgid "%1$s of %2$s element in problem state"
msgid_plural "%1$s of %2$s elements in problem state"
msgstr[0] "%2$s台中%1$s台の要素で障害発生中"
-#: jsLoader.php:324
+#: jsLoader.php:305
#, c-format
msgctxt "screen reader"
msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -213,13 +213,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 "%1$s文字入力可"
@@ -238,13 +238,13 @@ msgctxt "screen reader"
msgid "%1$s, Severity, %2$s"
msgstr "%1$sの深刻度は%2$s"
-#: jsLoader.php:318
+#: jsLoader.php:299
#, c-format
msgctxt "screen reader"
msgid "%1$s, read only"
msgstr "%1$sは読み込み専用です"
-#: jsLoader.php:361
+#: jsLoader.php:342
#, c-format
msgctxt "screen reader"
msgid "%1$s, selected"
@@ -372,7 +372,7 @@ msgstr "APIアクセス"
msgid "API methods"
msgstr "APIメソッド"
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
msgid "API token"
msgstr "APIトークン"
@@ -430,10 +430,6 @@ msgstr "APIトークン"
msgid "Abscissa"
msgstr "横座標"
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr "許容できるSLA"
-
#: include/func.inc.php:1511
msgid "Access denied"
msgstr "アクセスは拒否されました"
@@ -476,7 +472,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 "障害確認"
@@ -484,7 +480,7 @@ msgstr "障害確認"
msgid "Acknowledge problems"
msgstr "障害の確認"
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
#: include/events.inc.php:196
msgid "Acknowledged"
msgstr "確認済"
@@ -497,7 +493,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
@@ -524,9 +520,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
@@ -583,7 +579,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 "アクション\"%2$s\"はユーザーの役割\"%1$s\"に使用てきません。"
@@ -592,7 +588,7 @@ msgstr "アクション\"%2$s\"はユーザーの役割\"%1$s\"に使用てき
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 "アクションクラス%1$sは%2$sクラスを拡張してください。"
@@ -639,8 +635,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 "アクション"
@@ -707,7 +703,7 @@ msgstr "設定有効期間の終了日時"
#: app/views/administration.userrole.edit.php:381
#: app/views/administration.user.token.edit.php:84
#: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
#: app/views/configuration.dashboard.edit.php:59
#: app/views/configuration.discovery.edit.php:83
#: app/views/configuration.discovery.edit.php:146
@@ -718,7 +714,7 @@ msgstr "設定有効期間の終了日時"
#: app/views/js/reports.scheduledreport.edit.js.php:133
#: app/views/monitoring.dashboard.view.php:135
#: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
#: app/views/popup.dashboard.share.edit.php:36
#: app/views/popup.dashboard.share.edit.php:57
#: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -741,9 +737,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
@@ -813,7 +809,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 "追加"
@@ -821,11 +817,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 "子の要素を追加"
@@ -833,7 +829,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 "子サービスの追加"
@@ -850,7 +846,7 @@ msgstr "ホストを追加"
msgid "Add missing"
msgstr "未設定時に追加"
-#: jsLoader.php:193
+#: jsLoader.php:174
msgid "Add multiple maps"
msgstr "複数のマップを追加"
@@ -872,7 +868,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 "親サービスの追加"
@@ -924,12 +920,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"
@@ -939,7 +935,7 @@ msgstr "%1$sを追加しました"
msgid "Additional rule"
msgstr "追加のルール"
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
msgid "Additional rules"
msgstr "追加のルール"
@@ -952,7 +948,7 @@ msgstr "Admin"
msgid "Administration"
msgstr "管理"
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
msgid "Advanced configuration"
msgstr "高度な設定"
@@ -974,7 +970,7 @@ msgstr "表示期間"
msgid "Age less than %1$s"
msgstr "表示期間 %1$s"
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
#: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
#: include/views/js/configuration.host.edit.js.php:175
msgid "Agent"
@@ -1046,7 +1042,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 "すべて"
@@ -1064,7 +1060,7 @@ msgstr "すべてのグループ"
msgid "All hosts"
msgstr "すべてのホスト"
-#: jsLoader.php:272
+#: jsLoader.php:253
msgid "All links should have \"Name\" and \"URL\" specified"
msgstr "すべてのリンクに\"名前\"と\"URL\"を設定する必要があります"
@@ -1082,7 +1078,7 @@ msgstr "すべての障害"
msgid "All problems if tag values match"
msgstr "タグの値が一致したすべての障害"
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
msgid "All services"
msgstr "すべてのサービス"
@@ -1195,15 +1191,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 "適用"
@@ -1221,7 +1217,7 @@ msgstr "メンテナンス待ち"
msgid "Apr"
msgstr "4月"
-#: 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 "4月"
@@ -1249,9 +1245,9 @@ msgstr "エリアタイプ"
msgid "Arithmetic"
msgstr "計算"
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
msgid "As is"
-msgstr ""
+msgstr "そのまま"
#: include/views/monitoring.history.php:102
msgid "As plain text"
@@ -1296,7 +1292,7 @@ msgstr "開始時刻 (時:分)"
msgid "At least one UI element must be checked."
msgstr "少なくとも1つのUI要素をチェックしてください。"
-#: 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 "ユーザーの役割\"%1$s\"のために少なくとも1つのUI要素を有効にしてください。"
@@ -1305,7 +1301,7 @@ msgstr "ユーザーの役割\"%1$s\"のために少なくとも1つのUI要素
msgid "At least one action is mandatory."
msgstr "少なくとも1つのアクションが必要です。"
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
#: include/classes/api/services/CUser.php:1286
#, c-format
msgid "At least one active user must exist with role \"%1$s\"."
@@ -1317,6 +1313,11 @@ msgstr "少なくとも1人の有効なユーザーを役割\"%1$s\"と共に指
msgid "At least one host group or host must be selected."
msgstr "少なくとも1つのホストグループまたはホストが選択されている必要があります。"
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr "少なくとも1つのホストかテンプレートを指定する必要があります。"
+
#: include/classes/api/services/CMaintenance.php:380
#: include/classes/api/services/CMaintenance.php:388
#: include/classes/api/services/CMaintenance.php:635
@@ -1328,7 +1329,7 @@ msgstr "少なくとも1つ以上のメンテナンス期間を作成する必
msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
msgstr "少なくともMySQL、PostgreSQL、Oracleのうち1つ以上をサポートする必要があります。"
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
msgid "At least one operation must be selected."
msgstr "少なくとも1つ以上の実行内容が選択されている必要があります。"
@@ -1384,7 +1385,7 @@ msgstr "監査設定"
msgid "Aug"
msgstr "8月"
-#: 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 "8月"
@@ -1397,7 +1398,7 @@ msgstr "認証トークン"
msgid "AuthN requests"
msgstr "AuthNリクエスト"
-#: 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
@@ -1474,7 +1475,7 @@ msgstr "自動ログアウト"
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:62
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
#: include/views/configuration.host.edit.php:383
#: include/views/configuration.host.prototype.edit.php:358
msgid "Automatic"
@@ -1489,7 +1490,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
@@ -1541,7 +1542,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 "軸"
@@ -1604,7 +1605,7 @@ msgstr "ビット単位関数"
msgid "Blocked"
msgstr "ブロックしました"
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
msgid "Blue"
msgstr "Blue"
@@ -1658,11 +1659,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 "最前面へ"
@@ -1688,7 +1689,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"
@@ -1733,8 +1734,8 @@ msgstr "CRLF"
msgid "CSV to JSON"
msgstr "CSVからJSON"
-#: 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 "CUIDで指定してください"
@@ -1743,7 +1744,7 @@ msgstr "CUIDで指定してください"
msgid "Calculated"
msgstr "計算"
-#: jsLoader.php:220
+#: jsLoader.php:201
msgid "Calendar"
msgstr "カレンダー"
@@ -1768,7 +1769,7 @@ msgstr "コールバック"
#: app/views/administration.usergroup.edit.php:214
#: app/views/administration.userrole.edit.php:352
#: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
#: app/views/configuration.dashboard.edit.php:67
#: app/views/configuration.discovery.edit.php:140
#: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1781,8 +1782,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 "キャンセル"
@@ -1812,7 +1813,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 "ダッシュボードページが追加できません: 最大数%1$dのダッシュボードページが追加されています。"
@@ -1822,7 +1823,7 @@ msgstr "ダッシュボードページが追加できません: 最大数%1$d
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\"."
@@ -1853,8 +1854,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 "イメージを追加できません"
@@ -1945,15 +1946,15 @@ msgstr "ユーザーを追加できません"
msgid "Cannot add user group"
msgstr "ユーザーグループを追加できません"
-#: httpconf.php:228
+#: httpconf.php:200
msgid "Cannot add web scenario"
msgstr "Webシナリオを追加できません"
-#: 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 "削除できません"
@@ -1973,33 +1974,29 @@ msgstr "LDAPサーバーにバインドできません。"
msgid "Cannot build expression tree: %1$s."
msgstr "条件式ツリーを作成できません: %1$s。"
-#: 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 "ヒストリを削除できません:選択したアイテムの少なくとも1つが監視対象ホストに属していません"
-
-#: 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 "トリガーのプロトタイプを複製できません。"
@@ -2025,7 +2022,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] "アイテムをコピーできません"
@@ -2075,8 +2072,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 "サービス\"%1$s\"の作成ができません:%2$s。"
@@ -2104,7 +2101,7 @@ msgstr "Zabbixユーザー\"%1$s\"を削除できません。ユーザーを無
msgid "Cannot delete action"
msgstr "アクションを削除できません"
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
#, c-format
msgid "Cannot delete assigned user role \"%1$s\"."
msgstr "割り当てられたユーザーの役割\"%1$s\"が削除できません。"
@@ -2165,7 +2162,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one
msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group."
msgstr[0] "メンテナンス\"%1$s\"は少なくとも1つのホストかホストグループが必要なのでホストを削除できません。"
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
#, c-format
msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2175,11 +2172,11 @@ msgstr[0] "メンテナンス\"%1$s\"は少なくとも1つのホストかホス
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 "イメージを削除できません"
@@ -2204,7 +2201,7 @@ msgstr "アイテムのプロトタイプを削除できません"
msgid "Cannot delete item prototypes"
msgstr "アイテムのプロトタイプを削除できません"
-#: items.php:1126
+#: items.php:1048
msgid "Cannot delete items"
msgstr "アイテムを削除できません"
@@ -2232,7 +2229,7 @@ msgid "Cannot delete proxy"
msgid_plural "Cannot delete proxies"
msgstr[0] "プロキシを削除できません"
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
#, c-format
msgid "Cannot delete readonly user role \"%1$s\"."
msgstr "読み込み専用のユーザーの役割\"%1$s\"を削除できません。"
@@ -2252,7 +2249,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\"に使用されています。"
@@ -2266,8 +2263,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 "サービス\"%1$s\"の削除ができません:%2$s。"
@@ -2296,7 +2293,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 "テンプレートのアイテムを削除できません。"
@@ -2346,7 +2343,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 "Webシナリオを削除できません"
@@ -2376,7 +2373,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] "アイテムを無効にできません"
@@ -2402,7 +2399,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] "Webシナリオを無効にできません"
@@ -2443,7 +2440,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] "アイテムを有効にできません"
@@ -2469,7 +2466,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] "Webシナリオを有効にできません"
@@ -2482,7 +2479,7 @@ msgstr "条件式を評価できません"
msgid "Cannot execute script."
msgstr "スクリプトを実行できません。"
-#: jsLoader.php:275
+#: jsLoader.php:256
msgid "Cannot expand macros."
msgstr "マクロを展開できません。"
@@ -2516,8 +2513,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 "\"%4$s\"上のディスカバリルール\"%3$s\"のホストのプロトタイプ\"%2$s\"のためのホストグループ\"%1$s\"が見つかりません。"
-#: 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
@@ -2615,27 +2612,23 @@ msgstr "\"%3$s\"上のアイテム\"%2$s\"で使用されている値のマッ
msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
msgstr "\"%4$s\"上のディスカバリルール\"%3$s\"のアイテムのプロトタイプ\"%2$s\"で使用されている値のマッピング\"%1$s\"がみつかりません。"
-#: 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 ""
+msgstr "ユーザーの役割\"%1$s\"の\"%3$s\"を%4$dに設定している間はデフォルト以外の\"%2$s\"ルールを設定できません。"
-#: 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 ""
+msgstr "ユーサーの役割\"%1$s\"のルール\"%2$s\"内に空のタグがある間は空ではないタグの値を設定できません。"
#: include/classes/import/importers/CTemplateImporter.php:253
#: include/classes/import/importers/CTemplateImporter.php:405
@@ -2644,7 +2637,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
msgstr[0] "テンプレート\"%1$s\"をインポートできません。リンクされているテンプレート\"%2$s\"が存在しません。"
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
msgid "Cannot insert trigger expression"
msgstr "トリガー条件式を追加できません"
@@ -2658,7 +2651,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."
@@ -2689,17 +2682,17 @@ msgstr "テンプレートの表示名を一括更新できません。"
msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
msgstr "テンプレートIDの重複のためリンク%1$sを作成できません。"
-#: 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句がないため\"%1$s\"テーブルにdelete文を実行できません。"
-#: 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 "値がないため\"%1$s\"テーブルにupdate文を実行できません。"
-#: 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 "where句がないため\"%1$s\"テーブルにupdate文を実行できません。"
@@ -2726,7 +2719,7 @@ msgstr "YAML: %1$sが読み込めません。"
msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
msgstr "レスポンスを読めません。Zabbixサーバー\"%1$s\"との接続を確認してください。"
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
msgid "Cannot rename guest user."
msgstr "ゲストユーザーの名前は変更できません。"
@@ -2745,7 +2738,7 @@ msgstr "ウィジェットを保存できません \"%1$s\"。"
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 "リクエストが送信できません"
@@ -2785,12 +2778,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 ""
+msgstr "サービス\"%1$s\"は\"propagation_value\"パラメータを指定せずに\"propagation_rule\"パラメータを指定できません。"
-#: jsLoader.php:283
+#: jsLoader.php:264
msgid "Cannot support notification audio for this device."
msgstr "このデバイスでは音声通知をサポートしません。"
@@ -2808,7 +2801,7 @@ msgid "Cannot unblock user"
msgid_plural "Cannot unblock users"
msgstr[0] "ユーザーのブロック解除ができません"
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
msgid "Cannot unlink and clear Web scenarios."
msgstr "Webシナリオのリンク削除と削除が行えません。"
@@ -2821,7 +2814,7 @@ msgstr "テンプレートのリンクを削除できません"
msgid "Cannot unlink template."
msgstr "テンプレートのリンクを削除できません。"
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
#, c-format
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr "トリガー\"%1$s\"のリンクを削除できません。ホストにリンクされたテンプレートのアイテムを使用しています。"
@@ -2874,11 +2867,6 @@ msgstr "ディスカバリされたアイテム\"%1$s\"の\"%2$s\"を更新で
msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
msgstr "ディスカバリされたトリガー\"%1$s\"の\"%2$s\"を更新できません。"
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "イメージ\"%1$s\"の\"imagetype\"を更新できません。"
-
#: app/controllers/CControllerTokenUpdate.php:47
#: app/controllers/CControllerTokenUpdate.php:122
msgid "Cannot update API token"
@@ -2888,9 +2876,10 @@ msgstr "APIトークンを更新できません"
msgid "Cannot update a discovered graph."
msgstr "ディスカバリされたグラフを更新できません。"
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "ディスカバリされたホストグループを更新できません。"
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr "ディスカバリされたホストグループ\"%1$s\"を更新できません。"
#: include/classes/api/services/CHttpTest.php:514
#, c-format
@@ -2948,9 +2937,7 @@ msgstr "グラフのプロトタイプを更新できません"
msgid "Cannot update group"
msgstr "グループを更新できません"
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
#, c-format
msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "ディスカバリされたホスト\"%1$s\"のグループを更新できません。"
@@ -2972,13 +2959,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 "イメージを更新できません"
@@ -3031,12 +3018,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 "ディスカバリされたホスト\"%1$s\"のプロキシを更新できません。"
-#: 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 "読み込み専用のユーザーの役割\"%1$s\"を更新できません。"
@@ -3056,17 +3043,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 "スクリプトの範囲を更新できません。\"%1$s\"はアクション\"%2$s\"で使用されています。"
-#: 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 "サービス\"%1$s\"を更新できません:%2$s。"
@@ -3139,7 +3126,7 @@ msgstr[0] "ユーザーグループを更新できません"
msgid "Cannot update user role"
msgstr "ユーザーの役割を更新できません"
-#: httpconf.php:224
+#: httpconf.php:196
msgid "Cannot update web scenario"
msgstr "Webシナリオを更新できません"
@@ -3239,8 +3226,8 @@ msgid "Character string not included"
msgstr "文字列が含まれない"
#: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "Chars"
msgstr "文字"
@@ -3355,7 +3342,7 @@ msgstr "UDPサービスのパフォーマンスをチェック。サービスが
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 "子サービス"
@@ -3376,7 +3363,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 "アクション%2$sのためのクラス%1$sが見つかりません。"
@@ -3397,11 +3384,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 "クリックして表示または変更"
@@ -3416,7 +3403,7 @@ msgstr "時刻"
#: app/views/administration.regex.edit.php:147
#: app/views/administration.script.edit.php:284
#: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
#: app/views/configuration.discovery.edit.php:155
#: include/views/configuration.action.edit.php:493
#: include/views/configuration.graph.edit.php:510
@@ -3431,7 +3418,7 @@ msgstr "時刻"
#: 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 "複製"
@@ -3442,8 +3429,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 "閉じる"
@@ -3454,13 +3441,13 @@ msgstr "閉じる"
msgid "Close expression constructor"
msgstr "条件式ビルダーを閉じる"
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
msgid "Close new event"
msgstr "新しいイベントのクローズ"
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
msgid "Close old events"
msgstr "古いイベントのクローズ"
@@ -3473,8 +3460,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 "縮小"
@@ -3491,10 +3478,10 @@ 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 ""
+msgstr "色\"%1$s\"の設定が正しくありません: 16進数のカラーコードを指定してください(6桁)。"
#: include/views/js/monitoring.sysmaps.js.php:786
msgid "Color (OK)"
@@ -3557,7 +3544,7 @@ msgstr "圧縮"
msgid "Concurrent sessions"
msgstr "並列実行数"
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:49
msgid "Condition"
@@ -3568,17 +3555,12 @@ msgstr "トリガー条件式"
msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
msgstr "アクション\"%1$s\"の条件\"%2$s\"は式\"%3$s\"内で使用されていません。"
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "相関関係\"%1$s\"の条件\"%2$s\"は式\"%3$s\"内で使用されていません。"
-
-#: include/classes/api/services/CDiscoveryRule.php: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 "ディスカバリルール\"%1$s\"の条件\"%2$s\"は式\"%3$s\"内で使用されていません。"
-#: 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 "\"%1$s\"を上書きするための条件\"%2$s\"が式\"%3$s\"内で使用されていません。"
@@ -3588,17 +3570,12 @@ msgstr "\"%1$s\"を上書きするための条件\"%2$s\"が式\"%3$s\"内で使
msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
msgstr "アクション\"%1$s\"の式\"%3$s\"内で使用されている条件\"%2$s\"は設定されていません。"
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "相関関係\"%1$s\"の式\"%3$s\"で使用されている条件\"%2$s\"は設定されていません。"
-
-#: include/classes/api/services/CDiscoveryRule.php: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 "ディスカバリルール\"%1$s\"の式\"%3$s\"内で使用されている条件\"%2$s\"は設定されていません。"
-#: 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 "\"%1$s\"を上書きするための式\"%3$s\"内の条件\"%2$s\"は定義されていません。"
@@ -3614,7 +3591,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 "設定"
@@ -3677,7 +3654,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 "アイコンのマッピングの設定"
@@ -3784,7 +3761,7 @@ msgstr "確認テキスト"
msgid "Congratulations! You have successfully installed Zabbix frontend."
msgstr "おめでとうございます!Webインターフェースのインストールが終了しました。"
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
#: include/views/inventory.host.view.php:79
#: include/views/js/monitoring.sysmaps.js.php:771
msgid "Connect to"
@@ -3888,7 +3865,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
@@ -3948,7 +3925,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 "コンテンツコントロール"
@@ -3987,8 +3964,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 "コピー"
@@ -3997,12 +3974,11 @@ msgstr "コピー"
msgid "Copy to clipboard"
msgstr "クリップボードにコピー"
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
msgid "Correlation"
msgstr "相関関係"
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
#, c-format
msgid "Correlation \"%1$s\" already exists."
msgstr "相関関係\"%1$s\"はすでに存在しています。"
@@ -4026,16 +4002,6 @@ msgid "Correlation enabled"
msgid_plural "Correlations enabled"
msgstr[0] "相関関係を有効にしました"
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "相関関係がパラメータに設定されていません: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "相関関係名は必須項目です。"
-
#: include/events.inc.php:228
msgid "Correlation rule"
msgstr "相関関係ルール"
@@ -4044,14 +4010,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 "カウント"
@@ -4115,11 +4077,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 "依存アイテムの作成"
@@ -4236,7 +4198,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 "新規作成"
@@ -4260,7 +4222,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 "トリガーの作成"
@@ -4423,7 +4385,7 @@ msgstr "DNS"
#: app/views/administration.proxy.edit.php:50
#: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
#: include/views/inventory.host.view.php:79
msgid "DNS name"
msgstr "DNS名"
@@ -4435,11 +4397,11 @@ msgstr "DNS名"
msgid "Daily"
msgstr "毎日"
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
msgid "Dark"
msgstr "Dark"
-#: 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
@@ -4460,8 +4422,8 @@ msgstr "ダッシュボード\"%1$s\"はすでに存在します。"
msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
msgstr "ダッシュボード\"%1$s\"はレポート\"%2$s\"で使用しています。"
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
msgid "Dashboard created"
msgstr "ダッシュボードを作成しました"
@@ -4483,9 +4445,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 "ダッシュボードを更新しました"
@@ -4509,7 +4471,7 @@ msgstr "ID\"%1$s\"のダッシュボードは使用できません。"
#: 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 "ダッシュボード"
@@ -4537,7 +4499,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 "データセット"
@@ -4679,7 +4641,7 @@ msgstr "曜日"
msgid "Days"
msgstr "日"
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
msgid "Debug"
msgstr "デバッグ"
@@ -4693,26 +4655,26 @@ msgstr "デバッグモード"
msgid "Dec"
msgstr "12月"
-#: 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 "12月"
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
msgid "Decimal places"
msgstr "小数点以下桁数"
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
msgid "Decrease by"
-msgstr ""
+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 "標準"
@@ -4805,7 +4767,7 @@ msgstr "遅延時間"
#: app/views/administration.userrole.list.php:127
#: app/views/administration.user.token.edit.php:92
#: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
#: app/views/configuration.correlation.list.php:149
#: app/views/configuration.dashboard.list.php:67
#: app/views/configuration.discovery.edit.php:156
@@ -4829,8 +4791,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 "削除"
@@ -4855,11 +4817,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 "ダッシュボードを削除しますか?"
@@ -4903,7 +4865,7 @@ msgstr "アイテムのプロトタイプを削除しますか?"
msgid "Delete item?"
msgstr "アイテムを削除しますか?"
-#: jsLoader.php:274
+#: jsLoader.php:255
msgid "Delete links between selected elements?"
msgstr "選択した要素間のリンクを削除しますか?"
@@ -4959,7 +4921,7 @@ msgstr "選択したダッシュボードを削除しますか?"
msgid "Delete selected discovery rules?"
msgstr "選択したディスカバリルールを削除しますか?"
-#: jsLoader.php:261
+#: jsLoader.php:242
msgid "Delete selected elements?"
msgstr "選択した要素を削除しますか?"
@@ -5064,7 +5026,7 @@ msgstr "選択したサービスを削除しますか?"
msgid "Delete selected services?"
msgstr "選択したサービスを削除しますか?"
-#: jsLoader.php:262
+#: jsLoader.php:243
msgid "Delete selected shapes?"
msgstr "選択した図形を削除しますか?"
@@ -5108,7 +5070,7 @@ msgstr "トリガーを削除しますか?"
msgid "Delete web scenario?"
msgstr "Webシナリオを削除しますか?"
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
msgid "Deleted"
msgstr "削除しました"
@@ -5153,7 +5115,7 @@ msgstr "拒否リスト"
msgid "Dependencies"
msgstr "依存関係"
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
msgid "Dependent"
msgstr "依存先"
@@ -5161,7 +5123,7 @@ msgstr "依存先"
msgid "Dependent item"
msgstr "依存アイテム"
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5171,7 +5133,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
@@ -5204,7 +5166,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
@@ -5370,10 +5332,10 @@ msgstr "選択したWebシナリオを無効にしますか?"
#: app/views/popup.massupdate.host.php:102
#: app/views/popup.massupdate.host.php:187
#: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
@@ -5456,7 +5418,7 @@ msgid "Discovery by proxy"
msgstr "プロキシによるディスカバリ"
#: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
msgid "Discovery check"
msgstr "ディスカバリチェック"
@@ -5468,7 +5430,7 @@ msgstr "ディスカバリチェック"
msgid "Discovery list"
msgstr "ディスカバリリスト"
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
msgid "Discovery object"
msgstr "ディスカバリオブジェクト"
@@ -5500,7 +5462,7 @@ msgstr "VMware仮想マシンのファイルシステムのディスカバリ、
msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
msgstr "VMware仮想マシンのディスカバリ、<url> - VMwareサービスURL。JSONで返す"
-#: 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
@@ -5508,12 +5470,12 @@ msgstr "VMware仮想マシンのディスカバリ、<url> - VMwareサービスU
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 "ディスカバリルール\"%1$s\"は\"%2$s\"にすでに存在します。"
@@ -5526,7 +5488,7 @@ msgstr "ディスカバリルール\"%1$s\"は\"%2$s\"にすでに存在しま
msgid "Discovery rule \"%1$s\" already exists."
msgstr "ディスカバリルール\"%1$s\"はすでに存在します。"
-#: 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 "ディスカバリルール\"%1$s\"はマスターアイテムがないとコピーできません。"
@@ -5564,7 +5526,7 @@ msgstr "ディスカバリのルールを更新しました"
#: app/controllers/CControllerPopupImportCompare.php:169
#: app/views/configuration.discovery.edit.php:29
#: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
#: include/html.inc.php:386
#: include/views/configuration.host.discovery.edit.php:27
#: include/views/configuration.host.discovery.list.php:29
@@ -5575,7 +5537,7 @@ msgstr "ディスカバリルール"
msgid "Discovery rules deleted"
msgstr "ディスカバリのルールを削除しました"
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
#: include/classes/widgets/CWidgetConfig.php:48
msgid "Discovery status"
msgstr "ディスカバリのステータス"
@@ -5612,10 +5574,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件を表示しています"
@@ -5625,7 +5588,7 @@ msgstr "%2$s件のうち%1$s件を表示しています"
msgid "Displaying %1$s to %2$s of %3$s found"
msgstr "%3$s件のうち%1$sから%2$s件までを表示しています"
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
msgid "Displaying options"
msgstr "表示オプション"
@@ -5647,7 +5610,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 "条件式を置き換えますか?"
@@ -5703,7 +5666,7 @@ msgctxt "discovery status"
msgid "Down"
msgstr "Down"
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
msgid "Download image"
msgstr "イメージのダウンロード"
@@ -5711,7 +5674,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"
@@ -5730,18 +5693,6 @@ msgstr "グラフの形式"
msgid "Draw style"
msgstr "グラフの形式"
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "相関関係\"%3$s\"の\"%1$s\"の値\"%2$s\"が重複しています。"
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "相関関係の\"%1$s\"の値\"%2$s\"が重複しています。"
-
#: include/classes/api/services/CMap.php:614
#: include/classes/api/services/CMap.php:1076
#, c-format
@@ -5752,12 +5703,7 @@ msgstr "マップのための\"name\"の値\"%1$s\"が重複しています。"
#: include/classes/api/services/CMap.php:1285
#, c-format
msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
+msgstr "マップ\"%2$s\"のユーザーグループ内の\"usrgrpid\" \"%1$s\"が重複しています。"
#: include/classes/api/services/CTrigger.php:1142
#, c-format
@@ -5810,7 +5756,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名が使用されていないか確認してください"
@@ -5819,11 +5765,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
@@ -5837,8 +5783,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 "変更"
@@ -5854,11 +5800,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 "トリガーの変更"
@@ -5874,7 +5820,7 @@ msgstr "実効値"
#: include/classes/api/managers/CHistoryManager.php:1240
#, c-format
msgid "Elasticsearch URL is not set for type: %1$s."
-msgstr ""
+msgstr "ElasticsearchのURLが設定されていません。タイプ:%1$s"
#: include/classes/helpers/CElasticsearchHelper.php:86
#: include/classes/helpers/CElasticsearchHelper.php:185
@@ -5918,21 +5864,17 @@ msgstr "Webシナリオ\"%1$s\"のためのSSL秘密鍵ファイルが空白で
msgid "Empty color."
msgstr "色が指定されていません。"
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "相関関係IDが空白です。"
-
#: include/classes/api/services/CAction.php:2642
#, c-format
msgid "Empty filter condition formula ID for action \"%1$s\"."
msgstr "アクション\"%1$s\"のフィルター条件式IDが空白です。"
-#: 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 "ディスカバリルール\"%1$s\"のフィルター条件式IDが空白です。"
-#: 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 "ディスカバリルール\"%1$s\"のフィルター条件マクロが空白です。"
@@ -5948,25 +5890,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
msgstr "アクション\"%1$s\"のフィルター条件タイプが空白です。"
#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
#: include/classes/api/services/CDRule.php:194
#: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
#: include/classes/api/services/CHostInterface.php:584
#: include/classes/api/services/CHostInterface.php:628
#: include/classes/api/services/CHost.php:1319
#: 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."
@@ -5976,14 +5912,6 @@ msgstr "入力パラメータが空白です"
msgid "Empty map ID."
msgstr "マップIDが空白です。"
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "メディアタイプIDが空白です。"
-
-#: 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
@@ -6149,7 +6077,7 @@ msgstr "トラッピングの有効化"
#: app/views/administration.user.token.list.php:60
#: app/views/administration.user.token.list.php:126
#: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
#: app/views/configuration.correlation.list.php:56
#: app/views/configuration.correlation.list.php:119
#: app/views/configuration.discovery.edit.php:131
@@ -6160,7 +6088,7 @@ msgstr "トラッピングの有効化"
#: include/html.inc.php:284 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6203,7 +6131,7 @@ msgid "English (en_US)"
msgstr "英語 (en_US)"
#: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
#: include/classes/api/services/CHostPrototype.php:344
#: include/classes/api/services/CHttpTest.php:390
#: include/classes/api/services/CItemGeneral.php:634
@@ -6219,7 +6147,7 @@ msgstr "UUID \\\"%1$s\\\"のエントリはすでに存在します。"
#: 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
@@ -6238,19 +6166,19 @@ 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 "エラーメッセージ"
#: include/blocks.inc.php:643
#, c-format
msgid "Error! Unable to start Zabbix server due to unsupported %1$s database server version. Must be at least (%2$s)"
-msgstr ""
+msgstr "エラー!サポートされていないデータベースのバージョン%1$sなのでZabbixサーバーを起動できません。(%2$s)以上が必要です"
#: include/classes/screens/CScreenHttpTestDetails.php:111
#: include/classes/screens/CScreenHttpTestDetails.php:182
@@ -6270,7 +6198,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
@@ -6278,7 +6206,7 @@ msgid "Event correlation"
msgstr "イベント相関関係"
#: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
#: app/views/configuration.correlation.edit.php:31
msgid "Event correlation rules"
msgstr "イベント相関関係ルール"
@@ -6313,11 +6241,11 @@ msgstr "イベントログの監視。ログ値を返す。"
msgid "Event name"
msgstr "イベント名"
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
msgid "Event tag pair"
msgstr "イベントタグのペア"
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
msgid "Event type"
msgstr "イベントタイプ"
@@ -6361,15 +6289,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実行エラー [%2$s]内の[%1$s]。"
-
#: include/classes/items/CHelpItems.php:409
msgid "Execute WMI query and return the JSON document with all selected objects"
msgstr "WMIクエリを実行して選択したすべてのオブジェクトをJSONドキュメントで返す"
@@ -6407,7 +6330,7 @@ msgstr "実行"
msgid "Executed script"
msgstr "実行するスクリプト"
-#: jsLoader.php:208
+#: jsLoader.php:189
msgid "Execution confirmation"
msgstr "実行の確認"
@@ -6423,8 +6346,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 "展開"
@@ -6545,7 +6468,7 @@ msgstr "条件式"
msgid "External check"
msgstr "外部チェック"
-#: jsLoader.php:244
+#: jsLoader.php:225
msgctxt "Friday short"
msgid "F"
msgstr "F"
@@ -6570,10 +6493,10 @@ msgstr "失敗"
#: app/controllers/CControllerAuditLogList.php:192
msgid "Failed login"
-msgstr ""
+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"
@@ -6584,26 +6507,26 @@ msgstr "ダッシュボードの作成に失敗しました"
msgid "Failed to parse URL."
msgstr "URLを解析できませんでした。"
-#: 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 "ダッシュボードのプロパティの変更に失敗しました。"
@@ -6611,7 +6534,7 @@ msgstr "ダッシュボードのプロパティの変更に失敗しました。
msgid "Failed to update template."
msgstr "テンプレートの更新の失敗。"
-#: jsLoader.php:153
+#: jsLoader.php:134
msgid "Failed to update widget properties."
msgstr "ウィジェットのプロパティの変更に失敗しました。"
@@ -6635,7 +6558,7 @@ msgstr "お気に入りのマップ"
msgid "Feb"
msgstr "2月"
-#: 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 "2月"
@@ -6657,10 +6580,9 @@ msgstr "フィールド\"%1$s\"はNULLに設定できません。"
#: include/classes/api/services/CDRule.php:325
#: include/classes/api/services/CDRule.php:528
#: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
#: include/classes/api/services/CHost.php:892
#: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
#: include/validate.inc.php:286
#, c-format
msgid "Field \"%1$s\" is mandatory."
@@ -6671,13 +6593,6 @@ msgstr "フィールド\"%1$s\"は必須です。"
msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
msgstr "マップ\"%2$s\"のためのフィールド\"%1$s\"が設定されていません。"
-#: 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 "メディアタイプ\"%2$s\"のためのフィールド\"%1$s\"が設定されていません。"
-
#: 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
@@ -6696,11 +6611,6 @@ msgstr "フィールド\"%1$s\"は整数値ではありません。"
msgid "Field \"%1$s\" is not string."
msgstr "フィールド\"%1$s\"は文字列ではありません。"
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "メディアタイプ\"%2$s\"のためのフィールド\"%1$s\"を指定してください。"
-
#: include/validate.inc.php:298
#, c-format
msgid "Field \"%1$s\" must be missing."
@@ -6715,10 +6625,6 @@ msgstr "フィールド\"host\"は必須です。"
msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
msgstr "ファイルのチェックサム計算。UNIXのcksumアルゴリズムで計算する。crc32の整数値かmd5とsha256の文字列値を返す"
-#: 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 "ファイルの内容がありません"
@@ -6783,7 +6689,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
@@ -6808,7 +6715,7 @@ msgstr "フィルター"
msgid "Filter properties"
msgstr "フィルターのプロパティ"
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
msgid "Filter results"
msgstr "フィルター結果"
@@ -6860,9 +6767,9 @@ msgstr "マップに合わせる"
msgid "Fixed"
msgstr "固定"
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
msgid "Fixed status"
-msgstr ""
+msgstr "固定ステータス"
#: app/views/js/popup.massupdate.tmpl.js.php:81
#: app/views/popup.lldoperation.php:124
@@ -6890,7 +6797,7 @@ msgstr "フォント"
#: include/views/js/monitoring.sysmaps.js.php:541
msgid "Font color"
-msgstr "フォントの色"
+msgstr "フォント色"
#: include/views/js/monitoring.sysmaps.js.php:377
#: include/views/js/monitoring.sysmaps.js.php:535
@@ -6911,12 +6818,12 @@ msgstr "式"
msgid "Formula missing for action \"%1$s\"."
msgstr "アクション\"%1$s\"の式が設定されていません。"
-#: 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 "ディスカバリルール\"%1$s\"の式が設定されていません。"
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
#, c-format
msgid "Formula missing for override \"%1$s\"."
msgstr "上書き\"%1$s\"の式が設定されていません。"
@@ -6929,7 +6836,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 "金曜"
@@ -7040,7 +6947,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 "グローバルな正規表現\"%1$s\"は存在しません。"
@@ -7054,7 +6961,7 @@ msgstr "グローバル値"
msgid "Go back to %1$s"
msgstr "%1$sに戻る"
-#: jsLoader.php:344
+#: jsLoader.php:325
msgid "Go to"
msgstr "次のページへ移動"
@@ -7092,7 +6999,7 @@ msgstr "ページ%1$sへ、現在のページです"
msgid "Go to previous page, %1$s"
msgstr "前のページ%1$sへ"
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
msgid "Google Chrome"
msgstr "Google Chrome"
@@ -7100,7 +7007,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
@@ -7128,7 +7035,7 @@ msgstr "グラフ\"%1$s\"は\"%2$s\"にすでに存在します (アイテムは
#: include/classes/api/services/CGraphGeneral.php:1135
#, c-format
msgid "Graph \"%1$s\" already exists on \"%2$s\" as a graph created from graph prototype."
-msgstr ""
+msgstr "グラフ\"%1$s\"はグラフプロトタイプとして作成されたグラフとして\"%2$s\"上に存在します。"
#: include/classes/api/services/CGraphGeneral.php:1038
#: include/classes/api/services/CGraphGeneral.php:1246
@@ -7159,7 +7066,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
@@ -7196,8 +7103,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 "ID \"%1$s\"のグラフのプロトタイプは使用できません。"
@@ -7231,8 +7138,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 "ID \"%1$s\"のグラフは使用できません。"
@@ -7263,7 +7170,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 "グラフ"
@@ -7284,12 +7191,12 @@ msgstr "グリッド"
msgid "Group"
msgstr "グループ"
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
#, c-format
msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
msgstr "ホストのプロトタイプで使用されているためグループ\"%1$s\"は削除できません。"
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
#, c-format
msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
msgstr "相関関係の条件で使用されているためグループ\"%1$s\"は削除できません。"
@@ -7462,11 +7369,11 @@ msgstr "ヘルプ"
msgid "Hexadecimal to decimal"
msgstr "16進数から10進数"
-#: 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 "デバッグを隠す"
@@ -7493,11 +7400,11 @@ msgstr "階層"
msgid "High"
msgstr "重度の障害"
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
msgid "High-contrast dark"
msgstr "High-contrast dark"
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
msgid "High-contrast light"
msgstr "High-contrast light"
@@ -7518,7 +7425,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 "ヒストリ"
@@ -7526,11 +7433,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 "ヒストリを削除しました"
@@ -7573,7 +7484,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
@@ -7602,7 +7513,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
msgid "Host"
msgid_plural "Hosts"
@@ -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,10 +7534,10 @@ msgstr "ホスト\"%1$s\"はすでに存在しています。"
msgid "Host \"%1$s\" cannot be without host group."
msgstr "ホスト\"%1$s\"にホストグループを設定してください。"
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
#, c-format
msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
-msgstr ""
+msgstr "ホスト\"%1$s\"はプロキシ\"%2$s\"によって監視されています。"
#: include/actions.inc.php:55
msgid "Host IP"
@@ -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,25 +7598,25 @@ 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 "グローバルスクリプトに使用されているためホストグループ\"%1$s\"を削除できません。"
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
#, c-format
msgid "Host group \"%1$s\" is internal and cannot be deleted."
-msgstr ""
+msgstr "ホストグループ\"%1$s\"は組み込まれたグループなので削除できません。"
#: include/views/js/monitoring.sysmaps.js.php:103
msgid "Host group elements"
@@ -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 "ID \"%1$s\"のホストグループは使用できません。"
@@ -7734,8 +7645,8 @@ msgstr "ID \"%1$s\"のホストグループは使用できません。"
#: app/partials/popup.operations.php:199
#: app/views/monitoring.latest.view.php:56
#: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
#: app/views/popup.massupdate.host.php:46
#: app/views/popup.massupdate.template.php:48 app/views/search.php:266
#: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -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 "ID \"%1$s\"のホストは使用できません。"
@@ -7908,7 +7819,7 @@ msgstr "同じホスト名\"%1$s\"を持つホストがすでに存在します
msgid "Host with the same visible name \"%1$s\" already exists."
msgstr "同じホストの表示名\"%1$s\"を持つホストがすでに存在します。"
-#: 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 "同じホストの表示名\"%1$s\"を持つホストがすでに存在
#: app/views/monitoring.host.view.php:39
#: app/views/monitoring.latest.view.php:73
#: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
#: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
#: include/classes/helpers/CMenuHelper.php:44
#: include/classes/helpers/CMenuHelper.php:96
@@ -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 "IPアドレスの範囲\"%1$s\"がアドレスの制限\"%2$s\"を超え
#: app/views/monitoring.widget.hostavail.view.php:30
#: app/views/popup.massupdate.host.php:292
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
#: include/items.inc.php:350 include/views/configuration.host.edit.php:337
#: include/views/configuration.host.prototype.edit.php:325
#: include/views/js/configuration.host.edit.js.php:178
@@ -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 "アイコンのマッピング\"%1$s\"はすでに存在します。"
-#: 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 "ID \"%1$s\"のアイコンは使用できません。"
@@ -8157,18 +8068,18 @@ msgstr "システムの識別文字列。文字列値を返す。"
#, c-format
msgid "If at least %2$s child service has %1$s status or above"
msgid_plural "If at least %2$s child services have %1$s status or above"
-msgstr[0] ""
+msgstr[0] "少なくとも%2$s個の子サービスの状態が%1$s以上"
#: include/classes/helpers/CServiceHelper.php:35
#, c-format
msgid "If at least %2$s child services have %1$s status or above"
-msgstr ""
+msgstr "少なくとも%2$s個の子サービスの状態が%1$s以上"
#: include/classes/helpers/CServiceHelper.php:40
#: include/classes/helpers/CServiceHelper.php:89
#, c-format
msgid "If at least %2$s of child services have %1$s status or above"
-msgstr ""
+msgstr "少なくとも子サービスの%2$sの状態が%1$s以上"
#: app/views/popup.lldoverride.php:54
msgid "If filter matches"
@@ -8178,18 +8089,18 @@ msgstr "フィルターが一致した場合"
#, c-format
msgid "If less than %2$s child service has %1$s status or below"
msgid_plural "If less than %2$s child services have %1$s status or below"
-msgstr[0] ""
+msgstr[0] "%2$s個未満の子サービスのステータスが%1$s以下"
#: include/classes/helpers/CServiceHelper.php:45
#, c-format
msgid "If less than %2$s child services have %1$s status or below"
-msgstr ""
+msgstr "%2$s個未満の子サービスのステータスが%1$s以下"
#: include/classes/helpers/CServiceHelper.php:50
#: include/classes/helpers/CServiceHelper.php:101
#, c-format
msgid "If less than %2$s of child services have %1$s status or below"
-msgstr ""
+msgstr "子サービスの%2$s未満のステータスが%1$s以下"
#: include/classes/api/services/CReport.php:348
msgid "If no user groups are specified, at least one user must be included in the mailing list."
@@ -8201,7 +8112,7 @@ msgstr "ユーザーグループを指定しない場合は、少なくともメ
#: include/classes/helpers/CServiceHelper.php:110
#, c-format
msgid "If weight of child services with %1$s status or above is at least %2$s"
-msgstr ""
+msgstr "ステータスが%1$s以上の子サービスの重みが少なくとも%2$s"
#: include/classes/helpers/CServiceHelper.php:65
#: include/classes/helpers/CServiceHelper.php:70
@@ -8209,7 +8120,7 @@ msgstr ""
#: include/classes/helpers/CServiceHelper.php:118
#, c-format
msgid "If weight of child services with %1$s status or below is less than %2$s"
-msgstr ""
+msgstr "ステータスが%1$s以下の子サービスの重みが%2$s未満"
#: include/func.inc.php:1516 include/func.inc.php:1536
msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
@@ -8219,23 +8130,20 @@ msgstr "このメッセージが間違っている場合は、必要な権限を
msgid "Iframe sandboxing exceptions"
msgstr "Iframeサンドボックスの例外"
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
msgid "Ignore this service"
-msgstr ""
+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 "イメージ\"%1$s\"はすでに存在しています。"
@@ -8244,7 +8152,7 @@ msgstr "イメージ\"%1$s\"はすでに存在しています。"
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 "[%2$s]内の[%1$s]のイメージの読み込みエラー。"
-
-#: 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 "イメージのサイズは%1$s未満にしてください。"
-#: 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 ""
@@ -8490,7 +8392,7 @@ msgstr "Vaultのトークンが正しくありません。"
#: include/classes/api/services/CAction.php:3012
#: include/classes/api/services/CAction.php:3030
msgid "Incorrect action \"operationid\"."
-msgstr ""
+msgstr "アクションの\"operationid\"が正しくありません。"
#: include/classes/validators/CActionCondValidator.php:122
msgid "Incorrect action condition discovery check."
@@ -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 "テンプレート名\"%1$s\"に使用されている文字列が正し
msgid "Incorrect conditions for action \"%1$s\"."
msgstr "アクション\"%1$s\"の条件式が正しくありません。"
-#: 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 "ディスカバリルール\"%1$s\"の条件式が正しくありません。"
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "相関関係IDが正しくありません。"
-
#: include/classes/api/services/CAction.php:2609
#, c-format
msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
msgstr "アクション\"%1$s\"のカスタム条件式\"%2$s\"が正しくありません: %3$s。"
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "相関関係\"%1$s\"のカスタム条件式\"%2$s\"が正しくありません: %3$s。"
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
#, c-format
msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
msgstr "ディスカバリルール\"%1$s\"のカスタム条件式\"%2$s\"が正しくありません: %3$s。"
-#: 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 "\"%1$s\"を上書きするためのカスタム条件式\"%2$s\"が正しくありません: %3$s。"
@@ -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 "テーブル\"%2$s\"へのwhereステートメントのフィールド\"%1$s\"の名前または値が正しくありません。"
@@ -8764,22 +8637,17 @@ msgstr "アップロードされたファイルが正しくありません。"
msgid "Incorrect filter condition formula ID for action \"%1$s\"."
msgstr "アクション\"%1$s\"のフィルター条件式IDが正しくありません。"
-#: 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 "ディスカバリルール\"%1$s\"のフィルター条件式IDが正しくありません。"
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "相関関係\"%1$s\"のフィルター条件式IDが正しくありません。"
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
#, c-format
msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
msgstr "ディスカバリルール\"%1$s\"のフィルター条件マクロが正しくありません。"
-#: 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 "\"%1$s\"を上書きするためのフィルター条件マクロが正しくありません。"
@@ -8790,7 +8658,7 @@ msgstr "\"%1$s\"を上書きするためのフィルター条件マクロが正
msgid "Incorrect filter condition operator for action \"%1$s\"."
msgstr "アクション\"%1$s\"のフィルター条件演算子が正しくありません。"
-#: 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 "ディスカバリルール\"%1$s\"のフィルター条件演算子が正しくありません。"
@@ -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 "マップIDが正しくありません。"
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "メディアタイプIDが正しくありません。"
-
#: 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 "正規表現\"%1$s\"が正しくありません: \"%2$s\""
msgid "Incorrect response received from Zabbix server \"%1$s\"."
msgstr "Zabbixサーバー\"%1$s\"から正しくない値を受信しました。"
-#: 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,19 +8863,14 @@ msgstr "トリガーのプロトタイプの条件式が正しくありません
msgid "Incorrect type of calculation for action \"%1$s\"."
msgstr "アクション\"%1$s\"の計算のタイプが正しくありません。"
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "相関関係\"%1$s\"の計算タイプが正しくありません。"
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
#, c-format
msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
msgstr "ディスカバリルール\"%1$s\"の計算のタイプが正しくありません。"
#: include/classes/api/services/CAction.php:3067
msgid "Incorrect update action \"operationid\"."
-msgstr ""
+msgstr "更新するアクションの\"operationid\"が正しくありません。"
#: include/classes/api/services/CMap.php:764
#: include/classes/api/services/CMap.php:1232
@@ -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 "\"%2$s\"フィールドの値\"%1$s\"が正しくありません:%3$s
msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
msgstr "\"%2$s\"フィールドの値\"%1$s\"が正しくありません: %3$sから%4$sの間で設定してください。"
-#: 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 "浮動小数フィールド\"%2$s\"の値\"%1$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 "整数フィールド\"%2$s\"の値\"%1$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 "符号なし整数フィールド\"%2$s\"の値\"%1$s\"が正しくありません。"
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "相関関係\"%3$s\"のフィールド\"%2$s\"の値\"%1$s\"が正しくありません。"
-
-#: include/classes/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 "メディアタイプ\"%3$s\"のためのフィールド\"%2$s\"内の値\"%1$s\"が正しくありません。"
-
-#: 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 "\"%1$s\"フィールドのための値が正しくありません。"
#: include/classes/api/services/CAction.php:1862
#: include/classes/api/services/CAction.php:2856
#: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php: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 "\"%1$s\"フィールドのための値が正しくありません。"
#: include/classes/api/services/CMap.php:688
#: include/classes/api/services/CMap.php:1151
#: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/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 "\"%1$s\"フィールドのための値が正しくありません。"
#: include/classes/api/services/CTriggerGeneral.php:820
#: include/classes/api/services/CTriggerGeneral.php:827
#: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/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 "\"%1$s\"フィールドのための値が正しくありません。"
#: 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,9 +9197,9 @@ msgstr "\"%1$s\"フィールドのための値が正しくありません。"
msgid "Incorrect value for field \"%1$s\": %2$s."
msgstr "フィールド\"%1$s\": %2$sの値が正しくありません。"
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
msgid "Increase by"
-msgstr ""
+msgstr "深刻度を増やす"
#: include/locales.inc.php:60
msgid "Indonesian (id_ID)"
@@ -9437,7 +9241,7 @@ msgstr "情報"
#: include/classes/items/CHelpItems.php:337
#: include/classes/items/CHelpItems.php:719
msgid "Information about a file. Returns JSON"
-msgstr ""
+msgstr "ファイルの情報。JSONで返す"
#: include/classes/items/CHelpItems.php:201
#: include/classes/items/CHelpItems.php:583
@@ -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 "条件式の挿入"
@@ -9505,7 +9309,7 @@ msgstr "インストーラ名"
#: include/classes/helpers/CMenuHelper.php:344
msgid "Integrations"
-msgstr ""
+msgstr "インテグレーション"
#: app/partials/monitoring.host.view.html.php:30
#: app/views/administration.proxy.edit.php:77 disc_prototypes.php:42
@@ -9590,7 +9394,7 @@ msgstr "内部イベント発生"
msgid "Internal problem recovery"
msgstr "内部イベント復旧"
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
msgid "Internet Explorer"
msgstr "Internet Explorer"
@@ -9598,7 +9402,7 @@ msgstr "Internet Explorer"
#: 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,10 +9413,10 @@ msgstr "Internet Explorer"
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 ""
+msgstr "ユーザーの役割\"%1$s\"のためのAPIメソッド\"%2$s\"が正しくありません。"
#: include/classes/api/services/CHostInterface.php:829
#, c-format
@@ -9632,7 +9436,7 @@ msgstr "YAMLファイルの内容が正しくありません"
msgid "Invalid action condition: %1$s."
msgstr "アクションの実行条件が正しくありません:%1$s。"
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
#, c-format
msgid "Invalid condition: %1$s."
msgstr "条件が正しくありません: %1$s。"
@@ -9664,7 +9468,7 @@ msgstr "ID \"%1$s\"のメディアタイプのメールアドレスが正しく
msgid "Invalid interval \"%1$s\"."
msgstr "監視間隔\"%1$s\"が正しくありません。"
-#: 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 "\"%3$s\": %4$sのディスカバリルール\"%2$s\"のアイテムキー\"%1$s\"が正しくありません。"
@@ -9689,27 +9493,29 @@ msgstr "キー\"%1$s\": %2$sが正しくありません。"
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
@@ -9881,7 +9697,7 @@ msgstr "パラメータが正しくありません。"
#: include/classes/core/CJsonRpc.php:176
msgid "Invalid request."
-msgstr ""
+msgstr "リクエストが正しくありません。"
#: include/classes/api/services/CHttpTest.php:786
#, c-format
@@ -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 "アイテム\"%1$s\"はマスターアイテムがないとコピーで
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 "アイテムの保存前処理の引数が設定されていません:%1$s"
-#: 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 "ID \"%1$s\"のアイテムのプロトタイプは使用できません。"
@@ -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 "アイテムは監視データを取得しません。監視間隔は1sから1dで設定してください。定期設定や例外設定の監視間隔も利用できます。"
-#: 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 "ID \"%1$s\"のアイテムは使用できません。"
@@ -10236,11 +10047,11 @@ msgstr "キー\"%1$s\"が設定されたアイテムは指定したホスト\"%2
#: 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 "JSON"
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr "JSONの配列で指定してください。"
+
#: 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 "JSONデータ"
msgid "JSON is expected"
msgstr "JSONで指定してください"
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
msgid "JSON string is expected"
msgstr "JSON文字列で指定してください"
@@ -10313,7 +10128,7 @@ msgstr "JSONPath"
msgid "Jan"
msgstr "1月"
-#: 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 "1月"
@@ -10335,7 +10150,7 @@ msgstr "JavaScript"
msgid "Jul"
msgstr "7月"
-#: 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 "7月"
@@ -10343,7 +10158,7 @@ msgstr "7月"
msgid "Jun"
msgstr "6月"
-#: 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 "6月"
@@ -10493,22 +10308,6 @@ msgid "Last %1$d year"
msgid_plural "Last %1$d years"
msgstr[0] "最新の%1$d年間"
-#: 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 "最新1時間のグラフ"
-#: jsLoader.php:352
+#: jsLoader.php:333
msgid "Last month graph"
msgstr "最新1ヶ月のグラフ"
@@ -10562,11 +10361,11 @@ msgstr "最終送信日時"
msgid "Last value"
msgstr "最新の値"
-#: jsLoader.php:353
+#: jsLoader.php:334
msgid "Last week graph"
msgstr "最新1週間のグラフ"
-#: 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 "最新1週間のグラフ"
#: 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 "左側Y軸"
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 "凡例"
@@ -10649,7 +10448,7 @@ msgstr "線"
#: include/views/js/monitoring.sysmaps.js.php:597
msgid "Line color"
-msgstr "線の色"
+msgstr "線色"
#: include/views/js/monitoring.sysmaps.js.php:575
msgid "Line type"
@@ -10901,7 +10700,7 @@ msgstr "ローレベルディスカバリが\"取得不可\"の状態"
msgid "M"
msgstr "M"
-#: 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 "ファイルのMD5チェックサム。ファイルのMD5ハッシュ値を文字列値で返す。"
-#: 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 "ID \"%1$s\"のマップは使用できません。"
@@ -11187,7 +10986,7 @@ msgstr "マップ"
msgid "Mar"
msgstr "3月"
-#: 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 "3月"
@@ -11291,7 +11090,7 @@ msgid "Maximum required %1$s database version is %2$s."
msgstr "要求される%1$sデータベースの最大バージョンは%2$sです。"
#: 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] "表示できる最大の期間は%1$s日です。"
msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
msgstr "ID \"%1$s\"のメディアタイプのメールアドレスが最大長を超えています。"
-#: 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 "5月"
@@ -11319,15 +11118,12 @@ msgstr "5月"
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 "メディアタイプ\"%1$s\"はすでに存在しています。"
@@ -11351,11 +11147,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 "メディアタイプがパラメータに設定されていません: %1$s"
-
#: app/controllers/CControllerPopupMediatypeTestSend.php:45
#: app/controllers/CControllerPopupMediatypeTestSend.php:145
msgid "Media type test failed."
@@ -11385,7 +11176,7 @@ msgstr "ID \"%1$s\"のメディアタイプは使用できません。"
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 "メディアタイプはアクション\"%1$s\"に利用されています。"
@@ -11473,7 +11264,7 @@ msgstr "アラート表示"
msgid "Method not found."
msgstr "メソッドが見つかりません。"
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
msgid "Microsoft Edge"
msgstr "Microsoft Edge"
@@ -11535,7 +11326,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
@@ -11593,7 +11384,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 "モジュール"
@@ -11627,7 +11418,7 @@ msgstr[0] "モジュールを有効にしました: %1$s。"
msgid "Module updated: %1$s."
msgstr "モジュールを更新しました: %1$s。"
-#: 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 ""
@@ -11653,7 +11444,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 "月曜"
@@ -11693,11 +11484,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"
@@ -11715,13 +11506,13 @@ msgstr "ホストに\"%1$s\"の名前を持つグラフが1つ以上存在しま
#: include/classes/helpers/CServiceHelper.php:27
msgid "Most critical if all children have problems"
-msgstr ""
+msgstr "すべての子が障害であったときにもっとも重要"
#: include/classes/helpers/CServiceHelper.php:26
msgid "Most critical of child services"
-msgstr ""
+msgstr "子サービスでもっとも重要"
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
msgid "Mozilla Firefox"
msgstr "Mozilla Firefox"
@@ -11734,7 +11525,7 @@ msgstr "複数"
msgid "Multiple PROBLEM events"
msgstr "障害イベントを継続して生成"
-#: jsLoader.php:282
+#: jsLoader.php:263
msgid "Mute"
msgstr "ミュート"
@@ -11745,14 +11536,14 @@ msgstr "私が作成"
#: include/classes/helpers/CServiceHelper.php:37
#: include/classes/helpers/CServiceHelper.php:47
msgid "N"
-msgstr ""
+msgstr "N"
#: include/classes/helpers/CServiceHelper.php:42
#: include/classes/helpers/CServiceHelper.php:52
#: include/classes/helpers/CServiceHelper.php:62
#: include/classes/helpers/CServiceHelper.php:72
msgid "N%"
-msgstr ""
+msgstr "N%"
#: include/discovery.inc.php:53
msgid "NNTP"
@@ -11863,11 +11654,11 @@ msgstr "NTLM"
#: 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
@@ -12012,7 +11803,7 @@ msgstr "未監視"
#: app/views/popup.service.statusrule.edit.php:94
msgid "New additional rule"
-msgstr ""
+msgstr "新規追加ルール"
#: app/controllers/CControllerPopupConditionActions.php:94
#: app/controllers/CControllerPopupConditionEventCorr.php:87
@@ -12025,19 +11816,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 "新しいイベントタグの値"
@@ -12049,7 +11842,7 @@ msgstr "実行内容の作成"
msgid "New regular expression"
msgstr "正規表現の作成"
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
msgid "New service"
msgstr "新規サービス"
@@ -12057,7 +11850,7 @@ msgstr "新規サービス"
msgid "New service time"
msgstr "新規サービスタイム"
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
msgid "New tag name"
msgstr "新しいタグ名"
@@ -12066,7 +11859,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 "次のページ"
@@ -12084,7 +11877,7 @@ msgstr "次のステップ"
#: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
#: app/views/monitoring.widget.problems.view.php:264
#: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
#: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
#: app/views/popup.massupdate.item.php:328
#: app/views/popup.massupdate.item.php:337
@@ -12113,30 +11906,6 @@ msgstr "次のステップ"
msgid "No"
msgstr "いいえ"
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "相関関係\"%2$s\"に\"%1$s\"が定義されていません。"
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "相関関係に\"%1$s\"が定義されていません。"
-
#: include/classes/api/services/CGraphPrototype.php:39
#, c-format
msgid "No \"%1$s\" given for graph prototype."
@@ -12152,11 +11921,6 @@ msgstr "グラフに\"%1$s\"が定義されていません。"
msgid "No \"%1$s\" given for map."
msgstr "マップに\"%1$s\"が定義されていません。"
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "メディアタイプに\"%1$s\"が定義されていません。"
-
#: include/classes/api/services/CAction.php:2655
#: include/classes/api/services/CAction.php:2781
#: include/classes/api/services/CAction.php:2975
@@ -12164,7 +11928,7 @@ msgstr "メディアタイプに\"%1$s\"が定義されていません。"
msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
msgstr "アクション\"%1$s\"のフィルター条件の\"%2$s\"が定義されていません。"
-#: include/classes/api/services/CDiscoveryRule.php: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 "ディスカバリルール\"%1$s\"のフィルター条件の\"%2$s\"が定義されていません。"
@@ -12174,7 +11938,7 @@ msgstr "ディスカバリルール\"%1$s\"のフィルター条件の\"%2$s\"
msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
msgstr "アクション\"%1$s\"のフィルターの\"%2$s\"が定義されていません。"
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
#, c-format
msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
msgstr "ディスカバリルール\"%1$s\"のフィルターの\"%2$s\"が定義されていません。"
@@ -12191,11 +11955,6 @@ msgstr "認証ユーザー名が設定されていません。"
msgid "No changes."
msgstr "変更はありません。"
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "相関関係\"%1$s\"に条件のタイプが定義されていません。"
-
#: app/views/configuration.correlation.edit.php:56
#: include/views/configuration.action.edit.php:56
msgid "No conditions defined."
@@ -12226,7 +11985,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が設定されていません。"
@@ -12256,20 +12015,20 @@ msgstr "ファイルがアップロードされていません。"
#: include/graphs.inc.php:153
#, c-format
msgid "No graph item with graph ID \"%1$s\"."
-msgstr ""
+msgstr "グラフID\"%1$s\"のグラフアイテムが存在しません。"
#: app/views/monitoring.widget.favgraphs.view.php:26
msgid "No graphs added."
msgstr "グラフが追加されていません。"
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
msgid "No host IDs given."
msgstr "ホストIDが存在しません。"
#: include/hosts.inc.php:515
#, c-format
msgid "No host groups with group ID \"%1$s\"."
-msgstr ""
+msgstr "グループID\"%1$s\"のホストグループが存在しません。"
#: app/controllers/CControllerWidgetUrlView.php:51
msgid "No host selected."
@@ -12278,7 +12037,7 @@ msgstr "ホストが選択されていません。"
#: include/hosts.inc.php:558
#, c-format
msgid "No host with host ID \"%1$s\"."
-msgstr ""
+msgstr "ホストID\"%1$s\"のホストが存在しません。"
#: include/classes/api/services/CMapElement.php:176
#, c-format
@@ -12292,7 +12051,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 "インターフェースが見つかりません。"
@@ -12311,7 +12070,7 @@ msgstr "実行するアクションのインベントリモードが設定され
#: include/items.inc.php:742
#, c-format
msgid "No item with item ID \"%1$s\"."
-msgstr ""
+msgstr "アイテムID\"%1$s\"のアイテムが存在しません。"
#: chart3.php:145 chart7.php:56
msgid "No items defined."
@@ -12326,7 +12085,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 "条件に一致するデータはありません"
@@ -12334,17 +12093,46 @@ msgstr "条件に一致するデータはありません"
msgid "No new modules discovered"
msgstr "新しいモジュールは見つかりませんでした"
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "相関関係\"%1$s\"に実行内容のタイプが定義されていません。"
-
#: include/classes/api/services/CUser.php:1550
#: include/classes/api/services/CUser.php:2054
msgid "No permissions for system access."
msgstr "システムへのアクセス権がありません。"
#: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
#, c-format
msgid "No permissions to call \"%1$s.%2$s\"."
msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
@@ -12352,7 +12140,7 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
#: 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
@@ -12380,19 +12168,18 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
#: include/classes/api/services/CAction.php:1863
#: include/classes/api/services/CAction.php:2872
#: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
#: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php: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
@@ -12407,16 +12194,22 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
#: 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
@@ -12436,12 +12229,10 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
#: include/classes/api/services/CHttpTest.php:602
#: include/classes/api/services/CHttpTest.php:689
#: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php: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
@@ -12462,27 +12253,29 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
#: include/classes/api/services/CMap.php:1611
#: include/classes/api/services/CMap.php:2056
#: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php: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
@@ -12499,14 +12292,14 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
#: include/classes/api/services/CTriggerPrototype.php:515
#: include/classes/api/services/CTriggerPrototype.php:693
#: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/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
@@ -12515,7 +12308,7 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
#: 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 "対象が存在しないか、アクセス権がありません!"
@@ -12535,7 +12328,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 "リフレッシュなし"
@@ -12547,14 +12340,14 @@ msgstr "実行するアクションのコマンドにスクリプトが設定さ
msgid "No target selected"
msgstr "何も選択されていません"
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
msgid "No target selected."
msgstr "何も選択されていません。"
#: include/triggers.inc.php:91
#, c-format
msgid "No trigger with trigger ID \"%1$s\"."
-msgstr ""
+msgstr "トリガーID\"%1$s\"のトリガーが存在しません。"
#: chart4.php:42
msgid "No triggers defined."
@@ -12564,7 +12357,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 "論理値ではないフラグは廃止予定です。"
@@ -12634,15 +12427,15 @@ msgstr "すべての結果が表示されるわけではありません。 よ
msgid "Not all templates are linked to \"%1$s\"."
msgstr "すべてのテンプレートは\"%1$s\"にリンクされていません。"
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
msgid "Not allowed to set language for user \"guest\"."
msgstr "\"guest\"ユーザーは言語を設定できません。"
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
msgid "Not allowed to set password for user \"guest\"."
msgstr "ゲストユーザーはパスワードを設定できません。"
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
msgid "Not allowed to set theme for user \"guest\"."
msgstr "\"guest\"ユーザーはテーマを設定できません。"
@@ -12650,7 +12443,7 @@ msgstr "\"guest\"ユーザーはテーマを設定できません。"
#: include/classes/api/clients/CLocalApiClient.php:192
#: include/classes/api/clients/CLocalApiClient.php:218
msgid "Not authorized."
-msgstr ""
+msgstr "許可されていません。"
#: app/views/monitoring.widget.hostavail.view.php:34
#: app/views/monitoring.widget.hostavail.view.php:62
@@ -12674,7 +12467,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 "説明"
@@ -12705,7 +12498,7 @@ msgstr "障害通知送信済のユーザーすべてにメッセージを送信
msgid "Nov"
msgstr "11月"
-#: 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 "11月"
@@ -12721,7 +12514,7 @@ msgstr "使用可能なDSパスの数、<url> - VMwareサービスURL、<uuid> -
#: include/classes/items/CHelpItems.php:89
#: include/classes/items/CHelpItems.php:451
msgid "Number of currently open file descriptors. Returns integer"
-msgstr ""
+msgstr "現在開いているファイルディスクリプタの数。整数値を返す"
#: include/classes/items/CHelpItems.php:1209
msgid "Number of enabled items on the host."
@@ -12892,8 +12685,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
@@ -12953,13 +12746,13 @@ msgstr "10月"
msgid "Octal to decimal"
msgstr "8進数から10進数"
-#: 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 "10月"
#: 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 "OFF"
@@ -12967,30 +12760,31 @@ msgstr "OFF"
#: 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 "ON"
@@ -13006,35 +12800,15 @@ msgstr "一度だけ"
msgid "One"
msgstr "1つ"
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "ホストグループが設定されていないオブジェクトが残っています"
-
#: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
msgid "One time only"
msgstr "一度限り"
-#: 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 "Zabbixエージェント、SNMPv1、SNMPv2、SNMPv3がユニークかどうかだけチェックします。"
@@ -13082,10 +12856,6 @@ msgstr "子サービスのないサービスのみ"
msgid "Only services without problem tags"
msgstr "障害タグのないサービスのみ"
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "特権管理者のみが相関関係を作成できます。"
-
#: include/classes/api/services/CDashboard.php:414
msgid "Only super admins can set dashboard owner."
msgstr "特権管理者のみがダッシュボードのオーナーを設定できます。"
@@ -13094,15 +12864,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"
@@ -13111,7 +12877,7 @@ msgstr "Opera"
msgid "Operating system information. Returns string"
msgstr "OS情報。文字列値を返す。"
-#: 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 "処理内容"
@@ -13120,11 +12886,11 @@ msgstr "処理内容"
msgid "Operation \"%1$s\" already exists."
msgstr "実行するアクション\"%1$s\"はすでに存在しています。"
-#: 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 "実行内容の詳細"
@@ -13146,7 +12912,7 @@ msgstr "操作対象のテンプレートがありません。"
msgid "Operational data"
msgstr "運用データ"
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
#: include/views/configuration.action.edit.php:310
@@ -13155,33 +12921,33 @@ msgstr "運用データ"
msgid "Operations"
msgstr "実行内容"
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
msgid "Operator"
msgstr "オペレータ"
@@ -13290,7 +13056,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 "その他"
@@ -13304,7 +13070,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 "ダッシュボード\"%1$s\"のページ#%2$d上の X:%3$d, Y:%4$d にあるウィジェットと重複しています。"
@@ -13333,7 +13099,7 @@ msgid "Override with name \"%1$s\" already exists."
msgstr "\"%1$s\"という名前の上書きはすでに存在します。"
#: 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"
@@ -13522,7 +13288,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
@@ -13567,7 +13333,7 @@ msgstr "PSK"
msgid "PSK identity"
msgstr "PSKアイデンティティ"
-#: jsLoader.php:154
+#: jsLoader.php:135
#, c-format
msgid "Page %1$d"
msgstr "ページ %1$d"
@@ -13590,16 +13356,16 @@ msgstr "ページャー"
msgid "Parameter"
msgstr "パラメータ"
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
#: include/classes/api/services/CUser.php:182
#: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php: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 "パラメータ\"%1$s\"は廃止予定です。"
@@ -13629,7 +13395,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 "親サービス"
@@ -13646,10 +13412,10 @@ msgstr "親トリガー"
msgid "Parent web scenarios"
msgstr "親Webシナリオ"
-#: 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 ""
+msgstr "サービス\"%1$s\"と\"%2$s\"の親子関係が衝突しています。"
#: app/views/popup.httpstep.php:58
#: include/views/configuration.host.discovery.edit.php:86
@@ -13658,11 +13424,6 @@ msgstr ""
msgid "Parse"
msgstr "URL解析"
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "SQLパースエラー [%2$s]内の[%1$s]。"
-
#: include/classes/core/CJsonRpc.php:171
msgid "Parse error"
msgstr "パースエラー"
@@ -13723,7 +13484,7 @@ msgstr "パスワードポリシー"
msgid "Password requirements:"
msgstr "パスワード要件:"
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
msgid "Paste"
msgstr "貼り付け"
@@ -13733,15 +13494,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 "パターン"
@@ -13787,12 +13548,11 @@ msgstr "DNSクエリの実行。要求した情報のタイプの文字列を返
#: app/partials/scheduledreport.formgrid.html.php:87
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
#: include/views/configuration.host.discovery.edit.php:584
#: include/views/configuration.item.edit.php:675
#: include/views/configuration.item.prototype.edit.php:654
#: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
msgid "Period"
msgstr "期間"
@@ -13881,7 +13641,7 @@ msgstr "\"allow_url_fopen\"ディレクティブを有効にしてください
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 "Zabbixサーバーのホスト名かホストのIPアドレスとポート番号をを入力してください。必要に応じて名前も入力してください。"
-#: jsLoader.php:259
+#: jsLoader.php:240
msgid "Please select two elements"
msgstr "2つの要素を選択してください"
@@ -13921,7 +13681,7 @@ msgstr "ホストインベントリフィールドの自動設定"
#: app/views/administration.proxy.edit.php:50
#: app/views/administration.script.edit.php:163
#: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
#: include/views/configuration.host.list.php:106
#: include/views/inventory.host.view.php:79 setup.php:62
msgid "Port"
@@ -14010,7 +13770,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 "前のページ"
@@ -14141,7 +13901,7 @@ msgstr "メンテナンス期間外"
msgid "Problem is suppressed"
msgstr "メンテナンス期間中"
-#: jsLoader.php:280
+#: jsLoader.php:261
msgid "Problem on"
msgstr "障害"
@@ -14154,21 +13914,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
@@ -14182,9 +13938,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 "障害"
@@ -14218,7 +13974,7 @@ msgid "Prometheus to JSON"
msgstr "PrometheusからJSON"
#: 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 "プロパティ"
@@ -14239,13 +13995,13 @@ msgstr "指定されたURL \"%1$s\"は正しくありません。"
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
@@ -14253,7 +14009,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 "プロキシ\"%1$s\"はすでに存在しています。"
@@ -14263,12 +14019,12 @@ msgstr "プロキシ\"%1$s\"はすでに存在しています。"
msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
msgstr "ホスト\"%2$s\"のプロキシ\"%1$s\"は存在しません。"
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
#, c-format
msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
msgstr "プロキシ\"%1$s\"はアクション\"%2$s\"で使用されています。"
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
#, c-format
msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
msgstr "プロキシ\"%1$s\"はディスカバリルール\"%2$s\"に利用されています。"
@@ -14360,7 +14116,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"
@@ -14404,12 +14160,12 @@ msgstr "表示のみ"
#: app/views/administration.user.edit.php:552
#: app/views/administration.userrole.edit.php:180
msgid "Read-only access to services"
-msgstr ""
+msgstr "サービスの表示のみ"
#: app/views/administration.user.edit.php:561
#: app/views/administration.userrole.edit.php:204
msgid "Read-only access to services with tag"
-msgstr ""
+msgstr "タグとサービスの表示のみ"
#: app/partials/administration.usergroup.grouprights.html.php:69
#: app/views/administration.usergroup.edit.php:132
@@ -14425,22 +14181,18 @@ msgstr "表示/設定"
#: app/views/administration.user.edit.php:507
#: app/views/administration.userrole.edit.php:139
msgid "Read-write access to services"
-msgstr ""
+msgstr "サービスの表示/設定"
#: app/views/administration.user.edit.php:516
#: app/views/administration.userrole.edit.php:163
msgid "Read-write access to services with tag"
-msgstr ""
+msgstr "タグとサービスの表示/設定"
#: include/classes/items/CHelpItems.php:93
#: include/classes/items/CHelpItems.php:471
msgid "Reads modbus data. Returns various types"
msgstr "modbusデータを読み込む。様々なデータ型の値を返却"
-#: srv_status.php:146
-msgid "Reason"
-msgstr "理由"
-
#: include/actions.inc.php:60
msgid "Received value"
msgstr "受信した値"
@@ -14477,7 +14229,7 @@ msgstr "受信者"
#: app/views/reports.auditlog.list.php:74
#: app/views/reports.auditlog.list.php:96
msgid "Recordset ID"
-msgstr ""
+msgstr "記録ID"
#: app/views/administration.user.edit.php:684
#: include/classes/screens/CScreenProblem.php:1067
@@ -14522,7 +14274,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 "リフレッシュ間隔"
@@ -14540,13 +14292,13 @@ msgstr "選択したAPIトークンを再生成しますか?以前に生成さ
msgid "Regular"
msgstr "Regular"
-#: 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 "正規表現\"%1$s\"はすでに存在しています。"
@@ -14578,7 +14330,7 @@ msgstr "正規表現"
msgid "Related reports"
msgstr "関連するレポート"
-#: jsLoader.php:163
+#: jsLoader.php:144
msgid "Release to create a widget."
msgstr "作成したウィジェットを離す。"
@@ -14610,8 +14362,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
@@ -14632,7 +14382,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
@@ -14645,7 +14397,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
@@ -14722,8 +14474,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 "削除"
@@ -14763,7 +14515,7 @@ msgstr "%1$sの削除"
msgid "Removed"
msgstr "削除しました"
-#: jsLoader.php:317
+#: jsLoader.php:298
#, c-format
msgctxt "screen reader"
msgid "Removed, %1$s"
@@ -14805,7 +14557,7 @@ msgid "Replace dependencies"
msgstr "依存関係を置換"
#: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
msgid "Replacement"
msgstr "指定文字列"
@@ -14860,7 +14612,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 "リクエストを送信しました"
@@ -14902,8 +14654,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 "リセット"
@@ -14936,7 +14688,7 @@ msgstr "リセットの確認"
msgid "Reset defaults"
msgstr "デフォルトにリセット"
-#: jsLoader.php:281
+#: jsLoader.php:262
msgid "Resolved"
msgstr "解決済"
@@ -15002,7 +14754,7 @@ msgstr "レスポンスタイプ: 文字列"
#: app/views/popup.itemtestedit.view.php:326
#: app/views/popup.itemtestedit.view.php:366
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "結果"
@@ -15065,7 +14817,7 @@ msgstr "MBeanオブジェクトの属性の値を返す。"
#: include/classes/items/CHelpItems.php:349
#: include/classes/items/CHelpItems.php:731
msgid "Returns 4-digit string containing octal number with Unix permissions"
-msgstr ""
+msgstr "UNIXのバーミッションを4桁の8進数文字列で返す"
#: include/classes/items/CHelpItems.php:809
msgid "Returns ICMP ping response time in seconds. Example: 0.02"
@@ -15096,12 +14848,12 @@ msgstr "関連付けられているZabbix Java Gatewayの情報を返す。有
#: include/classes/items/CHelpItems.php:145
#: include/classes/items/CHelpItems.php:527
msgid "Returns number of TCP sockets that match parameters. Returns integer"
-msgstr ""
+msgstr "パラメータに一致したTCPソケットの数を返す。整数を返す"
#: include/classes/items/CHelpItems.php:161
#: include/classes/items/CHelpItems.php:543
msgid "Returns number of UDP sockets that match parameters. Returns integer"
-msgstr ""
+msgstr "パラメータに一致したUDPソケットの数を返す。整数で返す"
#: include/classes/items/CHelpItems.php:805
msgid "Returns percentage of lost ICMP ping packets."
@@ -15146,7 +14898,7 @@ msgstr "ルーマニア語 (ro_RO)"
#: app/partials/monitoring.service.list.edit.php:55
#: app/partials/monitoring.service.list.php:52
msgid "Root cause"
-msgstr ""
+msgstr "根本原因"
#: include/classes/widgets/forms/CWidgetForm.php:81
msgid "Rows"
@@ -15163,7 +14915,7 @@ msgstr "ルール"
#: include/actions.inc.php:635 include/actions.inc.php:813
#, c-format
msgid "Run script \"%1$s\" on Zabbix server"
-msgstr ""
+msgstr "Zabbixサーバー上でスクリプト\"%1$s\"を実行"
#: include/actions.inc.php:648 include/actions.inc.php:826
#, c-format
@@ -15189,12 +14941,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"
@@ -15205,8 +14957,8 @@ msgstr "SAML認証の設定"
#: 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"
@@ -15243,7 +14995,7 @@ msgstr "SMTPサーバーポート番号"
#: app/views/monitoring.widget.hostavail.view.php:28
#: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
#: include/items.inc.php:348
#: include/views/js/configuration.host.edit.js.php:176
msgid "SNMP"
@@ -15339,12 +15091,12 @@ msgstr "SQL数: %1$s (selects: %2$s | executes: %3$s)"
msgid "SQL query"
msgstr "SQLクエリ"
-#: 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\"。"
@@ -15407,7 +15159,7 @@ msgstr "SSOサービスURL"
msgid "STARTTLS"
msgstr "STARTTLS"
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
msgid "Safari"
msgstr "Safari"
@@ -15419,7 +15171,7 @@ msgstr "Sans-Serif"
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 "土曜"
@@ -15461,7 +15213,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 "定期レポート"
@@ -15525,7 +15277,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
@@ -15538,8 +15290,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 "スクリプト\"%1$s\"はすでに存在します。"
@@ -15570,12 +15321,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 "メディアタイプ\"%2$s\"のためのスクリプトパラメータ\"%1$s\"に最後の改行がありません。"
-
#: include/classes/debug/CProfiler.php:145
msgid "Script profiler"
msgstr "スクリプトプロファイラ"
@@ -15588,7 +15333,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 "スクリプト"
@@ -15658,8 +15403,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
@@ -15667,7 +15412,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 "選択"
@@ -15703,19 +15448,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 "%3$dの%2$dの位置にある%1$sを選択しました"
-#: 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 "%3$dの%2$dの位置にある読み込み専用の%1$sを選択しました"
-#: jsLoader.php:265
+#: jsLoader.php:246
msgid "Send backward"
msgstr "後面へ"
@@ -15740,7 +15485,7 @@ msgstr "次のメディアのみ使用"
msgid "Send to"
msgstr "送信先"
-#: jsLoader.php:266
+#: jsLoader.php:247
msgid "Send to back"
msgstr "再後面へ"
@@ -15773,7 +15518,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 "9月"
@@ -15804,28 +15549,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 ""
@@ -15835,7 +15580,7 @@ msgstr ""
msgid "Service actions"
msgstr "サービスアクション"
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
msgid "Service created"
msgstr "サービスを作成しました"
@@ -15844,7 +15589,6 @@ msgid "Service data storage period"
msgstr "サービスデータの保存期間"
#: app/controllers/CControllerServiceDelete.php:69
-#, fuzzy
msgid "Service deleted"
msgid_plural "Services deleted"
msgstr[0] "サービスを削除しました"
@@ -15867,16 +15611,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 "サービスのタグの値"
@@ -15884,11 +15628,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 "サービスのタイプ"
@@ -15897,38 +15641,37 @@ 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 "サービスの依存関係が循環設定されています。"
#: app/controllers/CControllerPopupMassupdateService.php:150
msgid "Services updated"
-msgstr ""
+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 "セッション初期化エラー。"
@@ -15958,17 +15701,17 @@ 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 "新しい値を設定"
#: app/views/popup.service.statusrule.edit.php:39
msgid "Set status to"
-msgstr ""
+msgstr "設定するステータス"
#: include/classes/helpers/CServiceHelper.php:28
msgid "Set status to OK"
-msgstr ""
+msgstr "ステータスを正常に設定"
#: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
#: include/views/js/item.preprocessing.js.php:67
@@ -15987,7 +15730,7 @@ msgstr "LDAPプロトコルの設定に失敗しました。"
msgid "Setting LDAP referrals to \"Off\" failed."
msgstr "LDAPリフェラルを「オフ」に設定できませんでした。"
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
msgid "Settings"
msgstr "設定"
@@ -15996,7 +15739,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
@@ -16052,7 +15795,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 "共有"
@@ -16194,7 +15937,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 "表示"
@@ -16303,7 +16046,7 @@ msgstr "ホスト\"%2$s\"へのグラフ\"%1$s\"のコピーをスキップし
msgid "Slovak (sk_SK)"
msgstr "スロバキア語 (sk_SK)"
-#: jsLoader.php:286
+#: jsLoader.php:267
msgid "Snooze"
msgstr "スヌーズ"
@@ -16349,7 +16092,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)"
@@ -16423,7 +16166,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 "スライドショーの開始"
@@ -16526,14 +16269,18 @@ msgstr "Zabbixの書き込みキャッシュの統計。cacheがvaluesならmode
#: 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 ""
+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"
@@ -16564,9 +16311,9 @@ msgstr "ステータスのみ"
msgid "Status problem"
msgstr "障害"
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
msgid "Status propagation rule"
-msgstr ""
+msgstr "ステータス伝搬ルール"
#: include/actions.inc.php:1921
#: include/classes/screens/CScreenHttpTestDetails.php:81
@@ -16612,7 +16359,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 "スライドショーの停止"
@@ -16677,7 +16424,7 @@ msgctxt "encryption certificate"
msgid "Subject"
msgstr "サブジェクト"
-#: jsLoader.php:356
+#: jsLoader.php:337
msgid "Submap"
msgstr "サブマップ"
@@ -16693,7 +16440,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 "成功メッセージ"
@@ -16706,7 +16453,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 "日曜"
@@ -16791,19 +16538,19 @@ msgstr "システム統計値。整数値または浮動小数点値を返す。
#: include/classes/items/CHelpItems.php:257
#: include/classes/items/CHelpItems.php:639
msgid "System time. Returns integer with type as UTC; string - with type as local"
-msgstr ""
+msgstr "システム時刻。utcなら整数値、localなら文字列で返す"
#: include/classes/items/CHelpItems.php:297
#: include/classes/items/CHelpItems.php:679
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"
@@ -16830,17 +16577,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 "タグ"
@@ -16896,7 +16643,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
@@ -16956,7 +16703,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
@@ -16977,7 +16724,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
@@ -17001,7 +16748,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 "テンプレートのダッシュボード"
@@ -17061,7 +16808,7 @@ msgstr "同じ表示名\"%1$s\"を持つテンプレートがすでに存在し
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
#: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
#: app/views/popup.massupdate.host.php:291 app/views/search.php:219
#: app/views/search.php:223 app/views/search.php:365
#: include/classes/helpers/CMenuHelper.php:153
@@ -17233,13 +16980,13 @@ msgstr "ホストがディスカバリされなくなったため%1$sに削除
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] "イメージはアイコンのマッピング%1$sに使用されています。"
-#: 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."
@@ -17266,7 +17013,7 @@ msgstr "ユーザー属性にパラメータ\"%1$s\"がありません。"
#: include/classes/core/CJsonRpc.php:177
msgid "The received JSON is not a valid JSON-RPC request."
-msgstr ""
+msgstr "受信したJSONは有効なJSON-RPCリクエストではありません。"
#: include/classes/core/CJsonRpc.php:182
msgid "The requested remote-procedure does not exist / is not available"
@@ -17303,7 +17050,7 @@ msgstr "このフィールドはアイテム\"%1$s\"によって自動的に設
msgid "This is the test message from Zabbix"
msgstr "これはZabbixからのテストメッセージです"
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
msgid "This month"
msgstr "今月"
@@ -17311,7 +17058,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 "今週"
@@ -17319,7 +17066,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 "今年"
@@ -17339,7 +17086,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 "木曜"
@@ -17356,7 +17103,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
@@ -17389,7 +17136,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
msgstr "最後にプロキシにアクセスした時間。name - プロキシの名前。有効なparamsの値:lastaccess - UNIXタイムスタンプ、delay - 秒数。"
#: 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 "期間"
@@ -17441,12 +17188,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 "すべてのアイテムのため1つのホストインターフェースを選択する必要があります"
#: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
msgid "Today"
msgstr "今日"
@@ -17561,7 +17307,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
@@ -17569,7 +17315,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 "トリガー"
@@ -17667,7 +17413,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
@@ -17739,11 +17485,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 "トリガーのステータス \"障害\""
@@ -17760,7 +17506,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
@@ -17795,7 +17541,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 "火曜"
@@ -17808,7 +17554,7 @@ msgstr "トルコ語 (tr_TR)"
msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
msgstr "2つのアイテム(\"%1$s\"と\"%2$s\")から1つのホストのインベントリフィールド\"%3$s\"を自動的に設定することはできません。"
-#: jsLoader.php:260
+#: jsLoader.php:241
msgid "Two map elements should be selected"
msgstr "2つのマップ要素を選択する必要があります"
@@ -17824,19 +17570,19 @@ msgstr "2つのマップ要素を選択する必要があります"
#: app/views/administration.user.edit.php:296
#: app/views/configuration.discovery.edit.php:79
#: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
#: app/views/popup.dashboard.share.edit.php:123
#: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
#: app/views/popup.massupdate.item.php:48
#: 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
@@ -17888,10 +17634,10 @@ 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 ""
+msgstr "ユーザーの役割\"%1$s\"にはUI要素\"%2$s\"は使用できません。"
#: app/views/js/administration.regex.edit.js.php:194
#: include/translateDefines.inc.php:25
@@ -17909,7 +17655,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"
@@ -17955,12 +17701,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
msgstr "マップ\"%1$s\"のURLには\"name\"と\"url\"の両方のフィールドが必要です。"
#: 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 "URL"
-#: 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 "UUIDv4で指定してください"
@@ -18045,16 +17791,16 @@ 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 "アクション%1$sから想定外の応答を受信しました。"
-#: 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."
-msgstr ""
+msgstr "想定しないエラーが発生しました。"
#: app/views/popup.massupdate.item.php:165
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:149
@@ -18070,21 +17816,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 "不明"
@@ -18102,7 +17850,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 "不明なアイテム。選択したホストにそのようなアイテムは存在しません"
@@ -18155,7 +17903,7 @@ msgstr "テンプレートとのリンクを解除"
msgid "Unlink from templates"
msgstr "テンプレートとのリンクを解除"
-#: jsLoader.php:284
+#: jsLoader.php:265
msgid "Unmute"
msgstr "ミュートを解除"
@@ -18185,7 +17933,7 @@ msgstr "サポートされていない実行内容です。"
msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
msgstr "アクション\"%1$s\"のフィルター条件ではパラメータ\"%2$s\"は使用できません。"
-#: 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 "ディスカバリルール\"%1$s\"のフィルター条件ではパラメータ\"%2$s\"はサポートされていません。"
@@ -18195,7 +17943,7 @@ msgstr "ディスカバリルール\"%1$s\"のフィルター条件ではパラ
msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
msgstr "アクション\"%1$s\"のフィルターではパラメータ\"%2$s\"は使用できません。"
-#: 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 "ディスカバリルール\"%1$s\"のフィルターではパラメータ\"%2$s\"はサポートされていません。"
@@ -18240,7 +17988,7 @@ msgstr "Up"
#: app/views/administration.usergroup.edit.php:221
#: app/views/administration.userrole.edit.php:378
#: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
#: app/views/configuration.discovery.edit.php:154
#: app/views/popup.acknowledge.edit.php:115
#: app/views/popup.dashboard.share.edit.php:155
@@ -18253,7 +18001,7 @@ msgstr "Up"
#: 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
@@ -18306,7 +18054,7 @@ msgstr "更新時の実行内容"
msgid "Update problem"
msgstr "障害更新"
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
#: app/controllers/CControllerPopupImportCompare.php:160
msgid "Updated"
msgstr "更新しました"
@@ -18324,7 +18072,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"
@@ -18344,7 +18092,7 @@ msgstr "bulkリクエストを使用"
#: app/views/administration.trigdisplay.edit.php:35
msgid "Use custom event status colors"
-msgstr ""
+msgstr "イベントのステータスの文字色を変更"
#: app/views/administration.user.edit.php:296 app/views/popup.media.php:88
msgid "Use if severity"
@@ -18359,7 +18107,7 @@ msgstr "iframeサンドボックスを使用する"
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
@@ -18374,7 +18122,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 "ユーザー\"%1$s\"にユーザーグループを設定してください。"
@@ -18412,7 +18160,7 @@ msgstr "ユーザー\"%1$s\"は代わりにレポート\"%2$s\"を作成した
#: app/controllers/CControllerUserUnblock.php:61
#, c-format
msgid "User \"%1$s\" unblocked."
-msgstr ""
+msgstr "ユーザー\"%1$s\"のブロックを解除しました。"
#: include/actions.inc.php:1976
msgid "User action"
@@ -18426,7 +18174,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 "ユーザーは無効のグループやGUIアクセスが無効のグループに自分自身を追加できません。"
@@ -18445,7 +18193,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
@@ -18455,27 +18203,27 @@ msgstr[0] "ユーザーを削除しました"
msgid "User group"
msgstr "ユーザーグループ"
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
#, c-format
msgid "User group \"%1$s\" already exists."
msgstr "ユーザーグループ\"%1$s\"はすでに存在します。"
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
#, c-format
msgid "User group \"%1$s\" is report \"%2$s\" recipient."
msgstr "ユーザーグループ\"%1$s\"はレポート\"%2$s\"の受信者です。"
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
#, c-format
msgid "User group \"%1$s\" is used in \"%2$s\" action."
msgstr "ユーザーグループ\"%1$s\"は\"%2$s\"アクション内で使用されています。"
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
#, c-format
msgid "User group \"%1$s\" is used in configuration for database down messages."
msgstr "ユーザーグループ\"%1$s\"はデータベース停止メッセージの設定に利用されています。"
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
#, c-format
msgid "User group \"%1$s\" is used in script \"%2$s\"."
msgstr "ユーザーグループ\"%1$s\"はスクリプト\"%2$s\"に利用されています。"
@@ -18507,8 +18255,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."
@@ -18552,17 +18300,17 @@ 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 ""
+msgstr "ユーザーの役割\"%1$s\"は既に存在します。"
#: app/controllers/CControllerUserroleCreate.php:141
msgid "User role created"
@@ -18626,7 +18374,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 "ID \"%1$s\"のユーザーは使用できません。"
@@ -18942,14 +18690,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
@@ -18959,7 +18707,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
@@ -19001,7 +18749,7 @@ msgstr "パラメータ\"grid_show\"の値\"%1$s\"が正しくありません。
msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
msgstr "パラメータ\"grid_show\"の値\"%1$s\"が正しくありません。\"%2$s\"を設定してください。"
-#: 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文字以内で設定してください。"
@@ -19018,7 +18766,7 @@ msgstr "値キャッシュの統計。有効なパラメータ:total, free, pf
msgid "Value cannot be empty."
msgstr "値を設定してください。"
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
msgid "Value map"
msgstr "値のマッピング"
@@ -19061,11 +18809,12 @@ msgstr "英語でWindowsパフォーマンスカウンターの値。数値、
msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
msgstr "任意のパフォーマンスカウンター値。リクエストに応じて、整数値、浮動小数点値、文字列値、テキスト値を返す。"
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
msgid "Value of new event tag"
msgstr "新しいイベントタグの値"
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
msgid "Value of old event tag"
msgstr "古いイベントタグの値"
@@ -19112,7 +18861,7 @@ msgstr "VaultのAPIエンドポイント"
msgid "Vault authentication token"
msgstr "Vaultの認証トークン"
-#: 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 "Vaultへの接続に失敗しました。"
@@ -19197,9 +18946,9 @@ msgstr "ホスト名を設定しない場合、表示名は必須項目です。
#: include/classes/helpers/CServiceHelper.php:57
#: include/classes/helpers/CServiceHelper.php:67
msgid "W"
-msgstr ""
+msgstr "W"
-#: jsLoader.php:242
+#: jsLoader.php:223
msgctxt "Wednesday short"
msgid "W"
msgstr "W"
@@ -19216,16 +18965,16 @@ 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 "警告メッセージ"
#: include/blocks.inc.php:649
#, c-format
msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
-msgstr ""
+msgstr "警告!データベースサーバーのバージョン%1$sはサポートされていません。(%2$s)以上が必要です"
-#: jsLoader.php:289
+#: jsLoader.php:270
msgid "We are sorry, the maximum possible number of elements to remember has been reached."
msgstr "要素を保存できる最大値に達しました"
@@ -19241,7 +18990,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"
@@ -19253,7 +19002,7 @@ msgstr "Web"
msgid "Web monitoring"
msgstr "Web監視"
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
msgid "Web scenario"
msgstr "Webシナリオ"
@@ -19268,25 +19017,25 @@ msgstr "Webシナリオ\"%1$s\"はホスト\"%2$s\"にすでに存在します
msgid "Web scenario \"%1$s\" already exists."
msgstr "Webシナリオ\"%1$s\"はすでに存在します。"
-#: httpconf.php:227
+#: httpconf.php:199
msgid "Web scenario added"
msgstr "Webシナリオを追加しました"
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
msgid "Web scenario deleted"
msgstr "Webシナリオを削除しました"
-#: httpconf.php:443
+#: httpconf.php:415
msgid "Web scenario disabled"
msgid_plural "Web scenarios disabled"
msgstr[0] "Webシナリオを無効にしました"
-#: httpconf.php:442
+#: httpconf.php:414
msgid "Web scenario enabled"
msgid_plural "Web scenarios enabled"
msgstr[0] "Webシナリオを有効にしました"
-#: httpconf.php:223
+#: httpconf.php:195
msgid "Web scenario updated"
msgstr "Webシナリオを更新しました"
@@ -19308,7 +19057,7 @@ msgstr "Webhookにはパラメータがありません。"
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 "水曜"
@@ -19319,9 +19068,9 @@ msgstr "水曜"
msgid "Weekly"
msgstr "毎週"
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
msgid "Weight"
-msgstr ""
+msgstr "重み"
#: include/classes/setup/CSetupWizard.php:45
msgid "Welcome"
@@ -19335,12 +19084,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 "ダッシュボード\"%1$s\"のページ#%2$d上の X:%3$d, Y:%4$d のウィジェットは範囲外です。"
-#: jsLoader.php:184
+#: jsLoader.php:165
msgid "Widget is too small for the specified number of columns and rows."
msgstr "指定された列と行の数に対してウィジェットが小さすぎます。"
@@ -19435,7 +19184,7 @@ msgstr "マップリンクの設定が正しくありません。"
#: include/classes/api/services/CMap.php:977
#: include/classes/api/services/CMap.php:1452
msgid "Wrong value for \"url\" field."
-msgstr ""
+msgstr "\"url\"フィールドが正しくありません。"
#: include/views/js/monitoring.sysmaps.js.php:303
#: include/views/js/monitoring.sysmaps.js.php:436
@@ -19535,6 +19284,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 "Y-n-d"
+
#: include/views/js/monitoring.sysmaps.js.php:446
msgid "Y1"
msgstr "Y1"
@@ -19596,7 +19349,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
@@ -19645,7 +19398,7 @@ msgstr "あなたはログインしていません"
#: app/views/popup.generic.php:90
msgid "You cannot switch hosts for current selection."
-msgstr ""
+msgstr "現在選択しているホストを切り替えることができません。"
#: include/classes/api/services/CAction.php:1808
#, c-format
@@ -19653,18 +19406,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
msgstr "アクションのグローバルスクリプト\"%1$s\"のターゲットが指定されていません。"
#: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
#: include/classes/api/services/CHost.php:848
#: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/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
@@ -19676,9 +19423,6 @@ msgstr "アクションのグローバルスクリプト\"%1$s\"のターゲッ
#: 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 "操作に対する権限がありません。"
@@ -19704,7 +19448,7 @@ msgstr "Zabbix"
#: include/classes/helpers/CMenuHelper.php:347
msgid "Zabbix Integrations"
-msgstr ""
+msgstr "Zabbixインテグレーション"
#: include/classes/helpers/CMenuHelper.php:340
msgid "Zabbix Technical Support"
@@ -19749,6 +19493,9 @@ msgid ""
"1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
"2. Incorrect network configuration.\n"
msgstr ""
+"Zabbixサーバー\"%1$s\"へ到達できません。以下の原因が考えられます:\n"
+"1. \"zabbix.conf.php\"に設定されたサーバーのIP/DNSが正しくない。\n"
+"2. ネットワークの設定が正しくない。\n"
#: app/views/administration.script.edit.php:125
msgid "Zabbix server (proxy)"
@@ -19794,24 +19541,28 @@ msgstr "[日の値が正しくありません: \"%1$s\"]"
msgid "[Wrong value for month: \"%1$s\" ]"
msgstr "[月の値が正しくありません: \"%1$s\"]"
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
msgid "a DNS name is expected"
msgstr "DNS名を指定してください"
-#: 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 "日付はYYYY-MM-DDフォーマットで指定してください。"
@@ -19820,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 ""
+msgstr "16進数のカラーコード(6桁)で指定してください"
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
msgid "a low-level discovery macro is expected"
msgstr "LLDマクロを指定してください"
-#: 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 "数字が大きすぎます"
@@ -19871,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 "時間の単位を指定してください"
@@ -19940,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 "IPアドレスを指定してください"
@@ -19948,42 +19700,37 @@ msgstr "IPアドレスを指定してください"
#: 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 "配列かオブジェクトで指定してください"
@@ -19993,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 "16進文字列で指定してください"
@@ -20001,11 +19748,15 @@ msgstr "16進文字列で指定してください"
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 "符号なし整数で指定してください"
@@ -20166,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
@@ -20203,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
@@ -20235,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
@@ -20250,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 "空白は指定できません"
@@ -20263,7 +20000,7 @@ msgstr "JSONに変換できません、結果の値が長すぎます"
msgid "cannot perform Scroll API request, data could be truncated"
msgstr "スクロールAPIリクエストを実行できません。データは切り捨てられます"
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
msgid "cannot update property for templated discovery rule"
msgstr "テンプレートのディスカバリルールのプロパティを更新できません"
@@ -20297,9 +20034,9 @@ msgstr "循環する依存関係は許可されていません"
msgid "circular item dependency is not allowed"
msgstr "循環するアイテムの依存関係は許可されていません"
-#: jsLoader.php:292
+#: jsLoader.php:273
msgid "color"
-msgstr ""
+msgstr "色"
#: app/partials/monitoring.problem.filter.php:236
#: include/classes/widgets/views/widget.problems.form.view.php:94
@@ -20315,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 "含む"
@@ -20344,7 +20082,7 @@ msgstr "count() - 期間Tで収集された値V(オペレータOを満たす)の
msgid "countunique() - The number of unique values"
msgstr "countunique() - ユニークな値の数"
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
msgctxt "day short"
msgid "d"
msgstr "d"
@@ -20406,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 "ディレクトリを指定してください"
@@ -20428,13 +20166,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
msgstr "ホスト\"%2$s\"上のディスカバリルール\"%1$s\"は監視されていません"
#: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
#: include/views/js/configuration.host.discovery.edit.overr.js.php:172
msgid "does not contain"
msgstr "含まない"
#: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
#: include/views/js/configuration.host.discovery.edit.overr.js.php:170
msgid "does not equal"
msgstr "等しくない"
@@ -20460,7 +20198,8 @@ msgid "e() - Returns Euler's number"
msgstr "e() - オイラー数を返す"
#: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
#: include/views/inventory.host.list.php:70
#: include/views/js/configuration.host.discovery.edit.overr.js.php:169
msgid "equals"
@@ -20497,6 +20236,10 @@ msgstr "条件式が指定されていません"
msgid "failed to parse JSON"
msgstr "JSONの解析に失敗しました"
+#: 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 "find() - 期間TでのパターンV(演算子0を満たす)の発生チェック(1 - 合致する、0 - 合致しない)"
@@ -20543,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"
@@ -20584,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 "画像サイズは%1$s以下にしてください"
+
#: include/actions.inc.php:28
msgid "in"
msgstr "期間中"
@@ -20624,15 +20372,19 @@ msgstr "要素の数が正しくありません"
msgid "incorrect expression starting from \"%1$s\""
msgstr "\"%1$s\"から始まる条件式が正しくありません"
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr "条件の数が正しくありません"
+
#: include/classes/parsers/CParser.php:118
#, c-format
msgid "incorrect syntax near \"%1$s\""
msgstr "間違った書式が\"%1$s\"付近に見つかりました"
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
#, c-format
msgid "incorrect usage of function \"%1$s\""
msgstr "関数\"%1$s\"の使い方が正しくありません"
@@ -20660,7 +20412,7 @@ msgstr "Prometheusパターンが正しくありません"
msgid "invalid address range \"%1$s\""
msgstr "アドレスの範囲 \"%1$s\"が正しくありません"
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
msgid "invalid byte sequence in UTF-8"
msgstr "UTF-8のバイトシーケンスが正しくありません"
@@ -20689,27 +20441,27 @@ msgstr "関数\"%1$s\"内の4番目のパラメーターが正しくありませ
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 "関数\"%1$s\"内のパラメーターの数が正しくありません"
#: 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 "正規表現が正しくありません"
@@ -20737,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 "{}で括られていないか不正な値です"
@@ -20823,12 +20575,12 @@ msgstr "ローレベルディスカバリルール"
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr "ltrim() - 文字列の先頭から指定した文字列を削除"
-#: 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"
@@ -20887,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 "最大期間がデフォルトのフィルタ期間よりも小さいです"
@@ -20927,7 +20679,7 @@ msgid "min() - Minimum value for period T"
msgstr "min() - 期間Tでの最小値"
#: 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 "%1$s文字以上で指定してください"
@@ -20943,19 +20695,19 @@ msgstr "mod() - 割り算の余り"
#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
-msgstr ""
+msgstr "monodec() - アイテムの値が減少し続けているかチェック (1 - 単調、0 - その他)、モード (strict - 厳密な単調性)"
#: app/controllers/CControllerPopupTriggerExpr.php:790
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
-msgstr ""
+msgstr "monoinc() - アイテムの値が増加し続けているかチェック (1 - 単調、0 - その他)、モード (strict - 厳密な単調性)"
#: include/func.inc.php:583
msgctxt "millisecond short"
msgid "ms"
msgstr "ms"
-#: include/classes/validators/CApiInputValidator.php: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 "%1$s文字の長さにしてください"
@@ -20968,29 +20720,16 @@ msgstr "有効なLDAPユーザーが必要です"
#: include/classes/validators/CPasswordComplexityValidator.php:74
#, c-format
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 "\"%1$s\"から\"%2$s\"の値で設定してください"
+msgstr "少なくとも%1$d文字以上にしてください"
#: 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 ""
+msgstr "少なくとも数字を1文字含めるようにしてください"
-#: 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 "少なくとも1つのLLDマクロを含めることが必要です"
@@ -20998,25 +20737,33 @@ msgstr "少なくとも1つのLLDマクロを含めることが必要です"
#: app/views/administration.user.edit.php:126
#: include/classes/validators/CPasswordComplexityValidator.php:81
msgid "must contain at least one lowercase and one uppercase Latin letter"
-msgstr ""
+msgstr "少なくとも英字の小文字1文字と大文字1文字を含めるようにしてください"
#: app/views/administration.authentication.edit.php:60
#: app/views/administration.user.edit.php:141
#: include/classes/validators/CPasswordComplexityValidator.php:95
msgid "must contain at least one special character"
-msgstr ""
+msgstr "少なくとも特殊記号を1文字含めるようにしてください"
#: app/views/administration.authentication.edit.php:99
#: app/views/administration.user.edit.php:148
#: include/classes/validators/CPasswordComplexityValidator.php:108
msgid "must not be one of common or context-specific passwords"
-msgstr ""
+msgstr "一般的なパスワードやコンテキスト固有のパスワードは使用しないでください"
#: app/views/administration.authentication.edit.php:98
#: app/views/administration.user.edit.php:147
#: include/classes/validators/CPasswordComplexityValidator.php:102
msgid "must not contain user's name, surname or username"
-msgstr ""
+msgstr "アカウント名やユーザーの姓名を含めないようにしてください"
+
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr "n-d"
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr "n-d H:i"
#: include/views/configuration.host.discovery.edit.php:182
#: include/views/configuration.host.discovery.edit.php:320
@@ -21028,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 "新規"
@@ -21163,7 +20910,7 @@ msgstr "出力"
msgid "path/to/secret"
msgstr "path/to/secret"
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
msgid "path/to/secret:key"
msgstr "path/to/secret:key"
@@ -21198,26 +20945,30 @@ msgstr "radians() - 値を角度からラジアンに変換"
msgid "rand() - A random integer value"
msgstr "rand() - ランダムな整数値"
-#: 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 ""
+msgstr "子サービス\"%1$s\"への表示/設定アクセス権が必要です"
-#: 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 ""
+msgstr "子サービス\"%1$s\"への表示/設定アクセス権を保持していません"
-#: 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 ""
+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 ""
+msgstr "サービスへの表示/設定アクセス権限を保持していません"
#: include/classes/widgets/fields/CWidgetFieldNavTree.php:110
msgid "reference to a non-existent tree element"
@@ -21243,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 "replace() - パターンを検索して指定文字列に置き換える"
@@ -21259,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 "round() - 小数点以下桁数で四捨五入"
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21309,13 +21060,13 @@ msgstr "選択"
#: include/events.inc.php:38 include/events.inc.php:66
msgid "service"
-msgstr ""
+msgstr "サービス"
#: app/views/popup.service.time.edit.php:128
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
@@ -21334,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 "空にしてください"
@@ -21358,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 "sin() - 値のサイン、ラジアンで示された角度の値"
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
msgid "sinh() - The hyperbolic sine of a value"
msgstr "sinh() - 値のハイパボリックサイン"
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr "skewness() - 確率分布の非対称性を測定"
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
msgid "sqrt() - Square root of a value"
msgstr "sqrt() - 値の平方根"
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
msgid "stddevpop() - Population standard deviation"
msgstr "stddevpop() - 母標準偏差"
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
msgid "stddevsamp() - Sample standard deviation"
msgstr "stddevsamp() - サンプル標準偏差"
@@ -21390,11 +21141,11 @@ msgstr "stddevsamp() - サンプル標準偏差"
msgid "sum"
msgstr "合計"
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
msgid "sum() - Sum of values of a period T"
msgstr "sum() - 期間Tでの合計値"
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
msgid "sumofsquares() - The sum of squares"
msgstr "sumofsquares() - 平方和"
@@ -21410,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
@@ -21422,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 "tan() - 値のタンジェント"
@@ -21431,13 +21182,17 @@ msgstr "tan() - 値のタンジェント"
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
@@ -21446,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 "パラメータ \"%1$s\"が指定されていません"
@@ -21491,39 +21246,39 @@ msgstr "第3"
msgid "third parameter is expected"
msgstr "3番目のパラメータを指定してください"
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
msgid "time filter default period exceeds the max period"
msgstr "デフォルトのフィルタ期間が最大期間を超えました"
-#: 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 "time() - 現在時刻"
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft() - 期間Tに基づく閾値に達するまでの時間"
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr "trendavg() - 期間のシフトを含む期間Tでの平均値"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr "trendcount() - 期間Tで正常に取得した値の数"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr "trendmax() - 期間のシフトを含む期間Tでの最大値"
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr "trendmin() - 期間のシフトを含む期間Tでの最小値"
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr "trendsum() - 期間のシフトを含む期間Tでの合計値"
@@ -21537,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 "トリガー条件式には少なくとも1つの /host/key の参照が必要です"
@@ -21549,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 "trim() - 文字列の先頭から最後までより指定した文字列を削除"
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
msgid "truncate() - Truncates a value to decimal places"
msgstr "truncate() - 小数点以下桁数で切り捨て"
#: 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 "アクセスできないURLです"
-#: 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\""
@@ -21576,11 +21331,11 @@ msgstr "定数 \"%1$s\" が間違っています"
#: 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 "定数値 \"%1$s\" が間違っています"
@@ -21597,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
@@ -21610,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 "パラメータ \"%1$s\"が間違っています"
@@ -21640,8 +21396,8 @@ msgstr "テキスト\"%1$s\"が間違っています"
#: include/classes/api/services/CItemGeneral.php:1622
#: include/classes/api/services/CItemGeneral.php:1648
#: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php: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\""
@@ -21666,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
@@ -21681,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
@@ -21701,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 "値\"%1$s\"はすでにあります"
@@ -21723,76 +21483,83 @@ msgstr "値\"%1$s\"が存在しません"
#: app/controllers/CControllerPopupValueMapUpdate.php:137
#: include/classes/api/services/CValueMap.php:575
#: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php: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 "値%1$sはすでにあります"
#: 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
-#, c-format
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
+#, fuzzy, c-format
msgid "value must be %1$s"
-msgstr "値は%1$sにしてください"
+msgid_plural "value must be one of %1$s"
+msgstr[0] "値は%1$sにしてください"
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
#, c-format
msgid "value must be between \"%1$s\" and \"%2$s\""
msgstr "値は\"%1$s\"から\"%2$s\"までにしてください"
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
msgid "value must be empty"
-msgstr ""
+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 "値は\"%1$s\"以下にしてください"
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
#, c-format
msgid "value must be no less than \"%1$s\""
msgstr "値は\"%1$s\"以上にしてください"
#: 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
@@ -21804,27 +21571,25 @@ msgstr "値は\"%1$s\"以上にしてください"
#: 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 "値は%1$sから指定してください"
-#: 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 ""
+msgstr "値は%1$sの範囲内にしてください"
#: include/classes/api/services/CItemGeneral.php:1560
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 "新しいイベントタグの値"
@@ -21837,11 +21602,11 @@ msgstr "2つめのパラメータの値が長すぎます"
msgid "value of third parameter must be one of %1$s"
msgstr "3つめのパラメータの値は%1$sから選んでください"
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
msgid "varpop() - Population variance"
msgstr "varpop() - 母分散"
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
msgid "varsamp() - Sample variance"
msgstr "varsamp() - サンプル分散"
@@ -21858,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"