[CRON] sync translated content

4 files changed, 30 insertions, 28 deletions

diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index f32afa34e2..ad7a5e09bc 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -223,11 +223,13 @@
 /ru/docs/Learn/How_the_Internet_works	/ru/docs/Learn/Common_questions/How_does_the_Internet_work
 /ru/docs/Learn/JavaScript/Asynchronous/Таймауты_и_интервалы	/ru/docs/Learn/JavaScript/Asynchronous/Timeouts_and_intervals
 /ru/docs/Learn/JavaScript/Building_blocks/События	/ru/docs/Learn/JavaScript/Building_blocks/Events
+/ru/docs/Learn/JavaScript/Objects/Inheritance	/ru/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
+/ru/docs/Learn/JavaScript/Objects/Object-oriented_JS	/ru/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
 /ru/docs/Learn/JavaScript/Объекты	/ru/docs/Learn/JavaScript/Objects
 /ru/docs/Learn/JavaScript/Объекты/Adding_bouncing_balls_features	/ru/docs/Learn/JavaScript/Objects/Adding_bouncing_balls_features
-/ru/docs/Learn/JavaScript/Объекты/Inheritance	/ru/docs/Learn/JavaScript/Objects/Inheritance
+/ru/docs/Learn/JavaScript/Объекты/Inheritance	/ru/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
 /ru/docs/Learn/JavaScript/Объекты/JSON	/ru/docs/Learn/JavaScript/Objects/JSON
-/ru/docs/Learn/JavaScript/Объекты/Object-oriented_JS	/ru/docs/Learn/JavaScript/Objects/Object-oriented_JS
+/ru/docs/Learn/JavaScript/Объекты/Object-oriented_JS	/ru/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
 /ru/docs/Learn/JavaScript/Объекты/Object_building_practice	/ru/docs/Learn/JavaScript/Objects/Object_building_practice
 /ru/docs/Learn/JavaScript/Объекты/Object_prototypes	/ru/docs/Learn/JavaScript/Objects/Object_prototypes
 /ru/docs/Learn/JavaScript/Объекты/Основы	/ru/docs/Learn/JavaScript/Objects/Basics
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index 7a042b1535..605e67f660 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -3582,7 +3582,7 @@
       "superpuper32"
     ]
   },
-  "Learn/JavaScript/Objects/Inheritance": {
+  "Learn/JavaScript/Objects/Classes_in_JavaScript": {
     "modified": "2020-10-17T04:55:20.992Z",
     "contributors": [
       "raylyanway",
@@ -3606,27 +3606,6 @@
       "slychai85"
     ]
   },
-  "Learn/JavaScript/Objects/Object-oriented_JS": {
-    "modified": "2020-11-28T15:15:40.063Z",
-    "contributors": [
-      "Tartalon",
-      "Viatcheslav-Malahov",
-      "wind-of",
-      "Detrimon",
-      "BadLame",
-      "ConstantineZz",
-      "ellegre",
-      "injashkin",
-      "NooNoo1337",
-      "Roman-Halenko",
-      "sergeomak",
-      "Elena_Petrenko",
-      "uandrew",
-      "slychai85",
-      "superpuper32",
-      "GennadyGlushenkov"
-    ]
-  },
   "Learn/JavaScript/Objects/Object_building_practice": {
     "modified": "2020-07-16T22:32:32.476Z",
     "contributors": [
@@ -24039,6 +24018,27 @@
       "iegik"
     ]
   },
+  "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": {
+    "modified": "2020-11-28T15:15:40.063Z",
+    "contributors": [
+      "Tartalon",
+      "Viatcheslav-Malahov",
+      "wind-of",
+      "Detrimon",
+      "BadLame",
+      "ConstantineZz",
+      "ellegre",
+      "injashkin",
+      "NooNoo1337",
+      "Roman-Halenko",
+      "sergeomak",
+      "Elena_Petrenko",
+      "uandrew",
+      "slychai85",
+      "superpuper32",
+      "GennadyGlushenkov"
+    ]
+  },
   "conflicting/MDN/Contribute": {
     "modified": "2020-10-30T09:21:05.942Z",
     "contributors": [
diff --git a/files/ru/learn/javascript/objects/object-oriented_js/index.html b/files/ru/conflicting/learn/javascript/objects/classes_in_javascript/index.html
index 409aa367f2..3fad32994e 100644
--- a/files/ru/learn/javascript/objects/object-oriented_js/index.html
+++ b/files/ru/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:
   - Constructor
   - Create
@@ -11,7 +11,7 @@ tags:
   - ООП
   - экземпляр
 translation_of: Learn/JavaScript/Objects/Object-oriented_JS
-original_slug: Learn/JavaScript/Объекты/Object-oriented_JS
+original_slug: Learn/JavaScript/Objects/Object-oriented_JS
 ---
 <div>{{LearnSidebar}}</div>
 
diff --git a/files/ru/learn/javascript/objects/inheritance/index.html b/files/ru/learn/javascript/objects/classes_in_javascript/index.html
index f1514a92c6..ec27663266 100644
--- a/files/ru/learn/javascript/objects/inheritance/index.html
+++ b/files/ru/learn/javascript/objects/classes_in_javascript/index.html
@@ -1,12 +1,12 @@
 ---
 title: Наследование в JavaScript
-slug: Learn/JavaScript/Objects/Inheritance
+slug: Learn/JavaScript/Objects/Classes_in_JavaScript
 tags:
   - JavaScript
   - Наследование
   - ООП
 translation_of: Learn/JavaScript/Objects/Inheritance
-original_slug: Learn/JavaScript/Объекты/Inheritance
+original_slug: Learn/JavaScript/Objects/Inheritance
 ---
 <p>
  <audio class="audio-for-speech"></audio>