[CRON] sync translated content

5 files changed, 28 insertions, 23 deletions

diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index aa50f26b06..377cf27043 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -221,7 +221,10 @@
 /ru/docs/Learn/HTML/Введение_в_HTML/Структура_документа_и_веб-сайта	/ru/docs/Learn/HTML/Introduction_to_HTML/Document_and_website_structure
 /ru/docs/Learn/HTML/Рецепты	/ru/docs/Learn/HTML/Howto
 /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/Asynchronous/Async_await	/ru/docs/Learn/JavaScript/Asynchronous/Promises
+/ru/docs/Learn/JavaScript/Asynchronous/Concepts	/ru/docs/conflicting/Learn/JavaScript/Asynchronous/Introducing
+/ru/docs/Learn/JavaScript/Asynchronous/Timeouts_and_intervals	/ru/docs/conflicting/Learn/JavaScript/Asynchronous
+/ru/docs/Learn/JavaScript/Asynchronous/Таймауты_и_интервалы	/ru/docs/conflicting/Learn/JavaScript/Asynchronous
 /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
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index 4a8d00b762..d6c88836f4 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -3137,21 +3137,6 @@
       "Sheppy"
     ]
   },
-  "Learn/JavaScript/Asynchronous/Async_await": {
-    "modified": "2020-12-10T12:33:00.159Z",
-    "contributors": [
-      "WhoRlyCares",
-      "Bucido"
-    ]
-  },
-  "Learn/JavaScript/Asynchronous/Concepts": {
-    "modified": "2020-12-02T05:41:10.583Z",
-    "contributors": [
-      "haltaction",
-      "KrasnovaM",
-      "snayp"
-    ]
-  },
   "Learn/JavaScript/Asynchronous/Introducing": {
     "modified": "2020-12-09T10:05:03.071Z",
     "contributors": [
@@ -3165,11 +3150,11 @@
       "MaxYenot"
     ]
   },
-  "Learn/JavaScript/Asynchronous/Timeouts_and_intervals": {
-    "modified": "2020-12-09T10:32:13.319Z",
+  "Learn/JavaScript/Asynchronous/Promises": {
+    "modified": "2020-12-10T12:33:00.159Z",
     "contributors": [
       "WhoRlyCares",
-      "velheor24"
+      "Bucido"
     ]
   },
   "Learn/JavaScript/Building_blocks": {
@@ -23981,6 +23966,21 @@
       "TuchaNK"
     ]
   },
+  "conflicting/Learn/JavaScript/Asynchronous": {
+    "modified": "2020-12-09T10:32:13.319Z",
+    "contributors": [
+      "WhoRlyCares",
+      "velheor24"
+    ]
+  },
+  "conflicting/Learn/JavaScript/Asynchronous/Introducing": {
+    "modified": "2020-12-02T05:41:10.583Z",
+    "contributors": [
+      "haltaction",
+      "KrasnovaM",
+      "snayp"
+    ]
+  },
   "conflicting/Learn/JavaScript/Objects": {
     "modified": "2019-06-04T15:16:30.349Z",
     "contributors": [
diff --git a/files/ru/learn/javascript/asynchronous/timeouts_and_intervals/index.html b/files/ru/conflicting/learn/javascript/asynchronous/index.html
index 19019a19a9..f87839f2ff 100644
--- a/files/ru/learn/javascript/asynchronous/timeouts_and_intervals/index.html
+++ b/files/ru/conflicting/learn/javascript/asynchronous/index.html
@@ -1,8 +1,8 @@
 ---
 title: 'Объединённый асинхронный JavaScript: Таймауты и интервалы'
-slug: Learn/JavaScript/Asynchronous/Timeouts_and_intervals
+slug: conflicting/Learn/JavaScript/Asynchronous
 translation_of: Learn/JavaScript/Asynchronous/Timeouts_and_intervals
-original_slug: Learn/JavaScript/Asynchronous/Таймауты_и_интервалы
+original_slug: Learn/JavaScript/Asynchronous/Timeouts_and_intervals
 ---
 <div>{{LearnSidebar}}</div>
 
diff --git a/files/ru/learn/javascript/asynchronous/concepts/index.html b/files/ru/conflicting/learn/javascript/asynchronous/introducing/index.html
index fe4e6c7343..1257b751b8 100644
--- a/files/ru/learn/javascript/asynchronous/concepts/index.html
+++ b/files/ru/conflicting/learn/javascript/asynchronous/introducing/index.html
@@ -1,6 +1,6 @@
 ---
 title: Основные понятия асинхронного программирования
-slug: Learn/JavaScript/Asynchronous/Concepts
+slug: conflicting/Learn/JavaScript/Asynchronous/Introducing
 tags:
   - JavaScript
   - Promises
@@ -9,6 +9,7 @@ tags:
   - блокировки
   - потоки
 translation_of: Learn/JavaScript/Asynchronous/Concepts
+original_slug: Learn/JavaScript/Asynchronous/Concepts
 ---
 <div>{{LearnSidebar}}{{NextMenu("Learn/JavaScript/Asynchronous/Introducing", "Learn/JavaScript/Asynchronous")}}</div>
 
diff --git a/files/ru/learn/javascript/asynchronous/async_await/index.html b/files/ru/learn/javascript/asynchronous/promises/index.html
index e64c9cc30b..4bf8481105 100644
--- a/files/ru/learn/javascript/asynchronous/async_await/index.html
+++ b/files/ru/learn/javascript/asynchronous/promises/index.html
@@ -1,11 +1,12 @@
 ---
 title: Making asynchronous programming easier with async and await
-slug: Learn/JavaScript/Asynchronous/Async_await
+slug: Learn/JavaScript/Asynchronous/Promises
 tags:
   - Асинхронность
   - Гайд
   - Для новичков
 translation_of: Learn/JavaScript/Asynchronous/Async_await
+original_slug: Learn/JavaScript/Asynchronous/Async_await
 ---
 <div>{{LearnSidebar}}</div>