[CRON] sync translated content

4 files changed, 32 insertions, 28 deletions

diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 1a0110161e..46bba1f59e 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1096,6 +1096,8 @@
 /zh-CN/docs/Learn/HTML/Multimedia_and_embedding/在网页中添加矢量图形	/zh-CN/docs/Learn/HTML/Multimedia_and_embedding/Adding_vector_graphics_to_the_Web
 /zh-CN/docs/Learn/JavaScript/First_steps/变量	/zh-CN/docs/Learn/JavaScript/First_steps/Variables
 /zh-CN/docs/Learn/JavaScript/First_steps/第一点	/zh-CN/docs/Learn/JavaScript/First_steps/A_first_splash
+/zh-CN/docs/Learn/JavaScript/Objects/Inheritance	/zh-CN/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
+/zh-CN/docs/Learn/JavaScript/Objects/Object-oriented_JS	/zh-CN/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
 /zh-CN/docs/Learn/JavaScript/Objects/向“弹跳球”演示程序添加新功能	/zh-CN/docs/Learn/JavaScript/Objects/Adding_bouncing_balls_features
 /zh-CN/docs/Learn/JavaScript/Objects/测试你的技能:面向对象的Javascript	/zh-CN/docs/Learn/JavaScript/Objects/Test_your_skills:_Object-oriented_JavaScript
 /zh-CN/docs/Learn/Tools_and_testing/Client-side_JavaScript_frameworks/介绍	/zh-CN/docs/Learn/Tools_and_testing/Client-side_JavaScript_frameworks/Introduction
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 316c67967b..3b0798204d 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -4716,7 +4716,7 @@
       "supermanbin"
     ]
   },
-  "Learn/JavaScript/Objects/Inheritance": {
+  "Learn/JavaScript/Objects/Classes_in_JavaScript": {
     "modified": "2020-07-30T15:02:15.810Z",
     "contributors": [
       "Damoness",
@@ -4753,31 +4753,6 @@
       "VtanSen"
     ]
   },
-  "Learn/JavaScript/Objects/Object-oriented_JS": {
-    "modified": "2020-11-05T13:41:11.779Z",
-    "contributors": [
-      "ceociocto",
-      "Jepson",
-      "ChongyouXu",
-      "九千鸦",
-      "Catherine-G",
-      "voidxiaobei",
-      "oceanMIH",
-      "WindLo",
-      "real-Row",
-      "GKilyar",
-      "Ray-Eldath",
-      "HYdragon",
-      "GloryChou",
-      "1013940326",
-      "Viki-Zhang",
-      "Leivy",
-      "breakair",
-      "zhangyangcisco",
-      "cylmemory",
-      "keyulin"
-    ]
-  },
   "Learn/JavaScript/Objects/Object_building_practice": {
     "modified": "2020-07-16T22:32:33.084Z",
     "contributors": [
@@ -46762,6 +46737,31 @@
       "xcffl"
     ]
   },
+  "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": {
+    "modified": "2020-11-05T13:41:11.779Z",
+    "contributors": [
+      "ceociocto",
+      "Jepson",
+      "ChongyouXu",
+      "九千鸦",
+      "Catherine-G",
+      "voidxiaobei",
+      "oceanMIH",
+      "WindLo",
+      "real-Row",
+      "GKilyar",
+      "Ray-Eldath",
+      "HYdragon",
+      "GloryChou",
+      "1013940326",
+      "Viki-Zhang",
+      "Leivy",
+      "breakair",
+      "zhangyangcisco",
+      "cylmemory",
+      "keyulin"
+    ]
+  },
   "conflicting/Learn/Server-side/Django": {
     "modified": "2019-03-23T23:11:53.165Z",
     "contributors": [
diff --git a/files/zh-cn/learn/javascript/objects/object-oriented_js/index.html b/files/zh-cn/conflicting/learn/javascript/objects/classes_in_javascript/index.html
index ddd1f3d2d5..5b6fa5b218 100644
--- a/files/zh-cn/learn/javascript/objects/object-oriented_js/index.html
+++ b/files/zh-cn/conflicting/learn/javascript/objects/classes_in_javascript/index.html
@@ -1,7 +1,8 @@
 ---
 title: 适合初学者的JavaScript面向对象
-slug: Learn/JavaScript/Objects/Object-oriented_JS
+slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
 translation_of: Learn/JavaScript/Objects/Object-oriented_JS
+original_slug: Learn/JavaScript/Objects/Object-oriented_JS
 ---
 <div>{{LearnSidebar}}</div>
 
diff --git a/files/zh-cn/learn/javascript/objects/inheritance/index.html b/files/zh-cn/learn/javascript/objects/classes_in_javascript/index.html
index eca486d343..635b1a9574 100644
--- a/files/zh-cn/learn/javascript/objects/inheritance/index.html
+++ b/files/zh-cn/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:
   - JavaScript
   - OOJS
@@ -9,6 +9,7 @@ tags:
   - 继承
   - 面向对象JS
 translation_of: Learn/JavaScript/Objects/Inheritance
+original_slug: Learn/JavaScript/Objects/Inheritance
 ---
 <div>{{LearnSidebar}}</div>