[CRON] sync translated content

6 files changed, 38 insertions, 30 deletions

diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index dc18833882..581c7efb46 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3291,6 +3291,10 @@
 /ja/docs/Web/API/WebGL_API/Lighting_in_WebGL	/ja/docs/Web/API/WebGL_API/Tutorial/Lighting_in_WebGL
 /ja/docs/Web/API/WebGL_API/Using_shaders_to_apply_color_in_WebGL	/ja/docs/Web/API/WebGL_API/Tutorial/Using_shaders_to_apply_color_in_WebGL
 /ja/docs/Web/API/WebGL_API/Using_textures_in_WebGL	/ja/docs/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL
+/ja/docs/Web/API/WebSocket/onclose	/ja/docs/conflicting/Web/API/WebSocket/close_event
+/ja/docs/Web/API/WebSocket/onerror	/ja/docs/conflicting/Web/API/WebSocket/error_event
+/ja/docs/Web/API/WebSocket/onmessage	/ja/docs/conflicting/Web/API/WebSocket/message_event
+/ja/docs/Web/API/WebSocket/onopen	/ja/docs/conflicting/Web/API/WebSocket/open_event
 /ja/docs/Web/API/WebSockets_API/WebSockets_reference	/ja/docs/Web/API/WebSockets_API
 /ja/docs/Web/API/WebVR_API/WebVR_concepts	/ja/docs/Web/API/WebVR_API/Concepts
 /ja/docs/Web/API/Web_Video_Text_Tracks_Format	/ja/docs/Web/API/WebVTT_API
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index ce326e0fb9..07dd56eff5 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -23601,32 +23601,6 @@
       "mfuji09"
     ]
   },
-  "Web/API/WebSocket/onclose": {
-    "modified": "2020-09-25T11:45:51.374Z",
-    "contributors": [
-      "maechabin"
-    ]
-  },
-  "Web/API/WebSocket/onerror": {
-    "modified": "2020-10-15T22:27:10.724Z",
-    "contributors": [
-      "mfuji09"
-    ]
-  },
-  "Web/API/WebSocket/onmessage": {
-    "modified": "2020-10-15T22:27:03.005Z",
-    "contributors": [
-      "maechabin",
-      "mfuji09"
-    ]
-  },
-  "Web/API/WebSocket/onopen": {
-    "modified": "2020-10-15T22:27:03.150Z",
-    "contributors": [
-      "Mr.Chenzm",
-      "mfuji09"
-    ]
-  },
   "Web/API/WebSocket/open_event": {
     "modified": "2020-10-15T22:27:02.962Z",
     "contributors": [
@@ -48568,6 +48542,32 @@
       "Wind1808"
     ]
   },
+  "conflicting/Web/API/WebSocket/close_event": {
+    "modified": "2020-09-25T11:45:51.374Z",
+    "contributors": [
+      "maechabin"
+    ]
+  },
+  "conflicting/Web/API/WebSocket/error_event": {
+    "modified": "2020-10-15T22:27:10.724Z",
+    "contributors": [
+      "mfuji09"
+    ]
+  },
+  "conflicting/Web/API/WebSocket/message_event": {
+    "modified": "2020-10-15T22:27:03.005Z",
+    "contributors": [
+      "maechabin",
+      "mfuji09"
+    ]
+  },
+  "conflicting/Web/API/WebSocket/open_event": {
+    "modified": "2020-10-15T22:27:03.150Z",
+    "contributors": [
+      "Mr.Chenzm",
+      "mfuji09"
+    ]
+  },
   "conflicting/Web/API/Window/scroll": {
     "modified": "2020-10-15T22:32:16.096Z",
     "contributors": [
diff --git a/files/ja/web/api/websocket/onclose/index.html b/files/ja/conflicting/web/api/websocket/close_event/index.html
index 4e029f4167..79582e481c 100644
--- a/files/ja/web/api/websocket/onclose/index.html
+++ b/files/ja/conflicting/web/api/websocket/close_event/index.html
@@ -1,7 +1,8 @@
 ---
 title: WebSocket.onclose
-slug: Web/API/WebSocket/onclose
+slug: conflicting/Web/API/WebSocket/close_event
 translation_of: Web/API/WebSocket/onclose
+original_slug: Web/API/WebSocket/onclose
 ---
 <p>{{APIRef("Web Sockets API")}}</p>
 
diff --git a/files/ja/web/api/websocket/onerror/index.html b/files/ja/conflicting/web/api/websocket/error_event/index.html
index 982851b486..d208a820c6 100644
--- a/files/ja/web/api/websocket/onerror/index.html
+++ b/files/ja/conflicting/web/api/websocket/error_event/index.html
@@ -1,6 +1,6 @@
 ---
 title: WebSocket.onerror
-slug: Web/API/WebSocket/onerror
+slug: conflicting/Web/API/WebSocket/error_event
 tags:
   - API
   - Connection
@@ -14,6 +14,7 @@ tags:
   - onerror
   - プロパティ
 translation_of: Web/API/WebSocket/onerror
+original_slug: Web/API/WebSocket/onerror
 ---
 <div>{{APIRef("Web Sockets API")}}</div>
 
diff --git a/files/ja/web/api/websocket/onmessage/index.html b/files/ja/conflicting/web/api/websocket/message_event/index.html
index f901d3f79f..e1888a6245 100644
--- a/files/ja/web/api/websocket/onmessage/index.html
+++ b/files/ja/conflicting/web/api/websocket/message_event/index.html
@@ -1,6 +1,6 @@
 ---
 title: WebSocket.onmessage
-slug: Web/API/WebSocket/onmessage
+slug: conflicting/Web/API/WebSocket/message_event
 tags:
   - API
   - Property
@@ -9,6 +9,7 @@ tags:
   - WebSocket
   - プロパティ
 translation_of: Web/API/WebSocket/onmessage
+original_slug: Web/API/WebSocket/onmessage
 ---
 <div>{{APIRef("Web Sockets API")}}</div>
 
diff --git a/files/ja/web/api/websocket/onopen/index.html b/files/ja/conflicting/web/api/websocket/open_event/index.html
index 79d4dcf2df..451ad8d6b6 100644
--- a/files/ja/web/api/websocket/onopen/index.html
+++ b/files/ja/conflicting/web/api/websocket/open_event/index.html
@@ -1,6 +1,6 @@
 ---
 title: WebSocket.onopen
-slug: Web/API/WebSocket/onopen
+slug: conflicting/Web/API/WebSocket/open_event
 tags:
   - API
   - Property
@@ -9,6 +9,7 @@ tags:
   - WebSocket
   - プロパティ
 translation_of: Web/API/WebSocket/onopen
+original_slug: Web/API/WebSocket/onopen
 ---
 <div>{{APIRef("Web Sockets API")}}</div>