resolve conflicts

elastic · Mar 10, 2021 · 1debf85 · 1debf85
1 parent 1655bee
commit 1debf85
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -23315,12 +23315,8 @@
     "xpack.uptime.synthetics.emptyJourney.message.footer": "表示する詳細情報はありません。",
     "xpack.uptime.synthetics.emptyJourney.message.heading": "ステップが含まれていませんでした。",
     "xpack.uptime.synthetics.emptyJourney.title": "ステップがありません。",
-    "xpack.uptime.synthetics.executedJourney.heading": "概要情報",
     "xpack.uptime.synthetics.executedStep.errorHeading": "エラー",
-    "xpack.uptime.synthetics.executedStep.scriptHeading": "スクリプトのステップ",
     "xpack.uptime.synthetics.executedStep.stackTrace": "スタックトレース",
-    "xpack.uptime.synthetics.executedStep.stepName": "{stepNumber}. {stepName}",
-    "xpack.uptime.synthetics.experimentalCallout.title": "実験的機能",
     "xpack.uptime.synthetics.imageLoadingSpinner.ariaLabel": "画像を示すアニメーションスピナーを読み込んでいます",
     "xpack.uptime.synthetics.journey.allFailedMessage": "{total}ステップ - すべて失敗またはスキップされました",
     "xpack.uptime.synthetics.journey.allSucceededMessage": "{total}ステップ - すべて成功しました",
@@ -23331,8 +23327,6 @@
     "xpack.uptime.synthetics.screenshot.noImageMessage": "画像がありません",
     "xpack.uptime.synthetics.screenshotDisplay.altText": "名前「{stepName}」のステップのスクリーンショット",
     "xpack.uptime.synthetics.screenshotDisplay.altTextWithoutName": "スクリーンショット",
-    "xpack.uptime.synthetics.screenshotDisplay.thumbnailAltText": "名前「{stepName}」のステップのサムネイルスクリーンショット",
-    "xpack.uptime.synthetics.screenshotDisplay.thumbnailAltTextWithoutName": "サムネイルスクリーンショット",
     "xpack.uptime.synthetics.statusBadge.failedMessage": "失敗",
     "xpack.uptime.synthetics.statusBadge.skippedMessage": "スキップ",
     "xpack.uptime.synthetics.statusBadge.succeededMessage": "成功",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -23673,12 +23673,8 @@
     "xpack.uptime.synthetics.emptyJourney.message.footer": "没有更多可显示的信息。",
     "xpack.uptime.synthetics.emptyJourney.message.heading": "此过程不包含任何步骤。",
     "xpack.uptime.synthetics.emptyJourney.title": "没有此过程的任何步骤",
-    "xpack.uptime.synthetics.executedJourney.heading": "摘要信息",
     "xpack.uptime.synthetics.executedStep.errorHeading": "错误",
-    "xpack.uptime.synthetics.executedStep.scriptHeading": "步骤脚本",
     "xpack.uptime.synthetics.executedStep.stackTrace": "堆栈跟踪",
-    "xpack.uptime.synthetics.executedStep.stepName": "{stepNumber}：{stepName}",
-    "xpack.uptime.synthetics.experimentalCallout.title": "实验功能",
     "xpack.uptime.synthetics.imageLoadingSpinner.ariaLabel": "表示图像正在加载的动画旋转图标",
     "xpack.uptime.synthetics.journey.allFailedMessage": "{total} 个步骤 - 全部失败或跳过",
     "xpack.uptime.synthetics.journey.allSucceededMessage": "{total} 个步骤 - 全部成功",
@@ -23689,8 +23685,6 @@
     "xpack.uptime.synthetics.screenshot.noImageMessage": "没有可用图像",
     "xpack.uptime.synthetics.screenshotDisplay.altText": "名称为“{stepName}”的步骤的屏幕截图",
     "xpack.uptime.synthetics.screenshotDisplay.altTextWithoutName": "屏幕截图",
-    "xpack.uptime.synthetics.screenshotDisplay.thumbnailAltText": "名称为“{stepName}”的步骤的缩略屏幕截图",
-    "xpack.uptime.synthetics.screenshotDisplay.thumbnailAltTextWithoutName": "缩略屏幕截图",
     "xpack.uptime.synthetics.statusBadge.failedMessage": "失败",
     "xpack.uptime.synthetics.statusBadge.skippedMessage": "已跳过",
     "xpack.uptime.synthetics.statusBadge.succeededMessage": "成功",