[CRON] sync translated content

4 files changed, 22 insertions, 18 deletions

diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 40ffd7a36e..e511d50334 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -2693,7 +2693,9 @@
 /ja/docs/Learn/HTML/Forms/Your_first_HTML_form	/ja/docs/Learn/Forms/Your_first_form
 /ja/docs/Learn/HTML/Forms/Your_first_HTML_form/Example	/ja/docs/Learn/Forms/Your_first_form/Example
 /ja/docs/Learn/HTML/Introduction_to_HTML/高度なテキスト成型	/ja/docs/Learn/HTML/Introduction_to_HTML/Advanced_text_formatting
-/ja/docs/Learn/JavaScript/Objects/継承	/ja/docs/Learn/JavaScript/Objects/Inheritance
+/ja/docs/Learn/JavaScript/Objects/Inheritance	/ja/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
+/ja/docs/Learn/JavaScript/Objects/Object-oriented_JS	/ja/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
+/ja/docs/Learn/JavaScript/Objects/継承	/ja/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
 /ja/docs/Learn/JavaScript/非同期	/ja/docs/Learn/JavaScript/Asynchronous
 /ja/docs/Learn/Performance/Populating_the_page:_how_browsers_work	/ja/docs/Web/Performance/How_browsers_work
 /ja/docs/Learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry	/ja/docs/orphaned/Learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index b55beced95..673d001d2e 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -5531,7 +5531,7 @@
       "chameleonhead"
     ]
   },
-  "Learn/JavaScript/Objects/Inheritance": {
+  "Learn/JavaScript/Objects/Classes_in_JavaScript": {
     "modified": "2020-12-12T19:47:14.522Z",
     "contributors": [
       "eldesh",
@@ -5554,19 +5554,6 @@
       "r-tamura"
     ]
   },
-  "Learn/JavaScript/Objects/Object-oriented_JS": {
-    "modified": "2020-12-06T14:17:48.495Z",
-    "contributors": [
-      "eldesh",
-      "silverskyvicto",
-      "mfuji09",
-      "JuthaDDA",
-      "Uemmra3",
-      "hamasaki",
-      "kenji-yamasaki",
-      "sii"
-    ]
-  },
   "Learn/JavaScript/Objects/Object_building_practice": {
     "modified": "2020-12-07T11:55:33.524Z",
     "contributors": [
@@ -48449,6 +48436,19 @@
       "momdo"
     ]
   },
+  "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": {
+    "modified": "2020-12-06T14:17:48.495Z",
+    "contributors": [
+      "eldesh",
+      "silverskyvicto",
+      "mfuji09",
+      "JuthaDDA",
+      "Uemmra3",
+      "hamasaki",
+      "kenji-yamasaki",
+      "sii"
+    ]
+  },
   "conflicting/MDN/Contribute/Markdown_in_MDN": {
     "modified": "2020-09-30T15:30:25.061Z",
     "contributors": [
diff --git a/files/ja/learn/javascript/objects/object-oriented_js/index.html b/files/ja/conflicting/learn/javascript/objects/classes_in_javascript/index.html
index 387400f5b0..66e8b522d0 100644
--- a/files/ja/learn/javascript/objects/object-oriented_js/index.html
+++ b/files/ja/conflicting/learn/javascript/objects/classes_in_javascript/index.html
@@ -1,6 +1,6 @@
 ---
 title: 初心者のためのオブジェクト指向 JavaScript
-slug: Learn/JavaScript/Objects/Object-oriented_JS
+slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
 tags:
   - Beginner
   - Create
@@ -12,6 +12,7 @@ tags:
   - 学習
   - 記事
 translation_of: Learn/JavaScript/Objects/Object-oriented_JS
+original_slug: Learn/JavaScript/Objects/Object-oriented_JS
 ---
 <div>{{LearnSidebar}}</div>
 
diff --git a/files/ja/learn/javascript/objects/inheritance/index.html b/files/ja/learn/javascript/objects/classes_in_javascript/index.html
index 2964fbe786..b0802b7072 100644
--- a/files/ja/learn/javascript/objects/inheritance/index.html
+++ b/files/ja/learn/javascript/objects/classes_in_javascript/index.html
@@ -1,6 +1,6 @@
 ---
 title: JavaScript での継承
-slug: Learn/JavaScript/Objects/Inheritance
+slug: Learn/JavaScript/Objects/Classes_in_JavaScript
 tags:
   - Article
   - CodingScripting
@@ -10,10 +10,11 @@ tags:
   - OOP
   - Object
   - Prototype
-  - 'l10n:priority'
+  - l10n:priority
   - 初心者
   - 学習
 translation_of: Learn/JavaScript/Objects/Inheritance
+original_slug: Learn/JavaScript/Objects/Inheritance
 ---
 <div>{{LearnSidebar}}</div>