[CRON] sync translated content

13 files changed, 51 insertions, 42 deletions

diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index b429d17874..f8a1ed0fdb 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -5522,6 +5522,7 @@
 /fr/docs/Web/WebGL/Commencer_avec_le_WebGL	/fr/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL
 /fr/docs/Web/WebGL/Using_shaders_to_apply_color_in_WebGL	/fr/docs/Web/API/WebGL_API/Tutorial/Using_shaders_to_apply_color_in_WebGL
 /fr/docs/Web/WebGL/Utiliser_les_textures_avec_WebGL	/fr/docs/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL
+/fr/docs/Web/Web_Components/HTML_Imports	/fr/docs/conflicting/Web/Web_Components
 /fr/docs/Web/Web_Components/Shadow_DOM	/fr/docs/Web/Web_Components/Using_shadow_DOM
 /fr/docs/Web/Web_Components/Utilisation_des_templates_et_des_slots	/fr/docs/Web/Web_Components/Using_templates_and_slots
 /fr/docs/Web/XML/Introduction_à_XML	/fr/docs/Web/XML/XML_introduction
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index d0a2f3d840..e17fdcfc2a 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -41541,13 +41541,6 @@
       "Zecat"
     ]
   },
-  "Web/Web_Components/HTML_Imports": {
-    "modified": "2020-10-15T22:12:01.555Z",
-    "contributors": [
-      "ledenis",
-      "ylerjen"
-    ]
-  },
   "Web/Web_Components/Using_custom_elements": {
     "modified": "2019-03-18T21:38:08.858Z",
     "contributors": [
@@ -44071,6 +44064,13 @@
       "JeffD"
     ]
   },
+  "conflicting/Web/Web_Components": {
+    "modified": "2020-10-15T22:12:01.555Z",
+    "contributors": [
+      "ledenis",
+      "ylerjen"
+    ]
+  },
   "conflicting/Web/XPath/Introduction_to_using_XPath_in_JavaScript": {
     "modified": "2019-01-16T14:19:09.912Z",
     "contributors": [
diff --git a/files/fr/web/web_components/html_imports/index.html b/files/fr/conflicting/web/web_components/index.html
index 4f26a4cbb1..3bdbcd3339 100644
--- a/files/fr/web/web_components/html_imports/index.html
+++ b/files/fr/conflicting/web/web_components/index.html
@@ -1,9 +1,10 @@
 ---
 title: HTML Imports
-slug: Web/Web_Components/HTML_Imports
+slug: conflicting/Web/Web_Components
 tags:
   - Composants Web
 translation_of: Web/Web_Components/HTML_Imports
+original_slug: Web/Web_Components/HTML_Imports
 ---
 <div>{{DefaultAPISidebar("Web Components")}}</div>
 
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index b887f46a1e..6e48cc80d1 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -4385,6 +4385,7 @@
 /ja/docs/Web/WebGL/Using_textures_in_WebGL	/ja/docs/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL
 /ja/docs/Web/WebGL/WebGL_best_practices	/ja/docs/Web/API/WebGL_API/WebGL_best_practices
 /ja/docs/Web/Web_Components/Custom_Elements	/ja/docs/Web/Web_Components/Using_custom_elements
+/ja/docs/Web/Web_Components/HTML_Imports	/ja/docs/conflicting/Web/Web_Components
 /ja/docs/Web/Web_Components/Status_in_Firefox	/ja/docs/orphaned/Web/Web_Components/Status_in_Firefox
 /ja/docs/Web/XSLT/Elements	/ja/docs/Web/XSLT/Element
 /ja/docs/Web/XSLT/Elements/apply-imports	/ja/docs/Web/XSLT/Element/apply-imports
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 89f6bad76a..0921037642 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -47585,12 +47585,6 @@
       "maybe"
     ]
   },
-  "Web/Web_Components/HTML_Imports": {
-    "modified": "2020-10-15T22:23:11.378Z",
-    "contributors": [
-      "reodog"
-    ]
-  },
   "Web/Web_Components/Using_custom_elements": {
     "modified": "2020-01-11T10:20:01.300Z",
     "contributors": [
@@ -48636,6 +48630,12 @@
       "Wind1808"
     ]
   },
+  "conflicting/Web/Web_Components": {
+    "modified": "2020-10-15T22:23:11.378Z",
+    "contributors": [
+      "reodog"
+    ]
+  },
   "orphaned/Building_a_Mozilla_Distribution": {
     "modified": "2019-03-23T23:49:07.062Z",
     "contributors": [
diff --git a/files/ja/web/web_components/html_imports/index.html b/files/ja/conflicting/web/web_components/index.html
index 8c432a5c01..19162e4678 100644
--- a/files/ja/web/web_components/html_imports/index.html
+++ b/files/ja/conflicting/web/web_components/index.html
@@ -1,7 +1,8 @@
 ---
 title: HTML インポート
-slug: Web/Web_Components/HTML_Imports
+slug: conflicting/Web/Web_Components
 translation_of: Web/Web_Components/HTML_Imports
+original_slug: Web/Web_Components/HTML_Imports
 ---
 <p>{{DefaultAPISidebar("Web Components")}}</p>
 
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index b61407949d..dcdb318df3 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -675,6 +675,7 @@
 /ru/docs/Web/WebGL/Animating_objects_with_WebGL	/ru/docs/Web/API/WebGL_API/Tutorial/Animating_objects_with_WebGL
 /ru/docs/Web/WebGL/Getting_started_with_WebGL	/ru/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL
 /ru/docs/Web/WebGL/Using_shaders_to_apply_color_in_WebGL	/ru/docs/Web/API/WebGL_API/Tutorial/Using_shaders_to_apply_color_in_WebGL
+/ru/docs/Web/Web_Components/HTML_Imports	/ru/docs/conflicting/Web/Web_Components
 /ru/docs/Web/Web_Components/Использование_пользовательских_элементов	/ru/docs/Web/Web_Components/Using_custom_elements
 /ru/docs/Web/XPath/Funkcje	/ru/docs/Web/XPath/Functions
 /ru/docs/Web/XPath/Funkcje/floor	/ru/docs/Web/XPath/Functions/floor
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index d77429f430..716c988409 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -23845,12 +23845,6 @@
       "Kalita-Roman"
     ]
   },
-  "Web/Web_Components/HTML_Imports": {
-    "modified": "2019-03-18T21:40:10.986Z",
-    "contributors": [
-      "PaulineNemchak"
-    ]
-  },
   "Web/Web_Components/Using_custom_elements": {
     "modified": "2020-01-05T09:04:07.966Z",
     "contributors": [
@@ -24697,6 +24691,12 @@
       "ruslan_g02"
     ]
   },
+  "conflicting/Web/Web_Components": {
+    "modified": "2019-03-18T21:40:10.986Z",
+    "contributors": [
+      "PaulineNemchak"
+    ]
+  },
   "orphaned/Glossary/Polifill": {
     "modified": "2019-03-23T22:18:26.835Z",
     "contributors": [
diff --git a/files/ru/web/web_components/html_imports/index.html b/files/ru/conflicting/web/web_components/index.html
index 06dab35aba..71cfa2e114 100644
--- a/files/ru/web/web_components/html_imports/index.html
+++ b/files/ru/conflicting/web/web_components/index.html
@@ -1,7 +1,8 @@
 ---
 title: HTML Импорты
-slug: Web/Web_Components/HTML_Imports
+slug: conflicting/Web/Web_Components
 translation_of: Web/Web_Components/HTML_Imports
+original_slug: Web/Web_Components/HTML_Imports
 ---
 <div class="warning">
 <p>Firefox will not ship <em>HTML Imports</em> in its current form. See this <a href="https://hacks.mozilla.org/2015/06/the-state-of-web-components/">status update</a> for more information. Until there is a consensus on the standard or alternative mechanisms are worked out, you can use a polyfill such as Google's <code><a href="https://github.com/webcomponents/webcomponentsjs">webcomponents.js</a></code>.</p>
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 701804d446..90ff7ef11f 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -243,7 +243,7 @@
 /zh-CN/docs/DOM/ImageData	/zh-CN/docs/Web/API/ImageData
 /zh-CN/docs/DOM/KeyboardEvent	/zh-CN/docs/Web/API/KeyboardEvent
 /zh-CN/docs/DOM/MouseScrollEvent	/zh-CN/docs/Web/API/MouseScrollEvent
-/zh-CN/docs/DOM/MouseWheelEvent	/zh-CN/docs/Web/API/MouseWheelEvent
+/zh-CN/docs/DOM/MouseWheelEvent	/zh-CN/docs/conflicting/Web/API/WheelEvent
 /zh-CN/docs/DOM/MutationObserver	/zh-CN/docs/Web/API/MutationObserver
 /zh-CN/docs/DOM/Node	/zh-CN/docs/Web/API/Node
 /zh-CN/docs/DOM/Node.appendChild	/zh-CN/docs/Web/API/Node/appendChild
@@ -1389,6 +1389,7 @@
 /zh-CN/docs/Web/API/Location.replace	/zh-CN/docs/Web/API/Location/replace
 /zh-CN/docs/Web/API/MediaStream.addTrack	/zh-CN/docs/Web/API/MediaStream/addTrack
 /zh-CN/docs/Web/API/MouseEvent/which	/zh-CN/docs/conflicting/Web/API/UIEvent/which
+/zh-CN/docs/Web/API/MouseWheelEvent	/zh-CN/docs/conflicting/Web/API/WheelEvent
 /zh-CN/docs/Web/API/Navigator.battery	/zh-CN/docs/Web/API/Navigator/battery
 /zh-CN/docs/Web/API/Navigator.buildID	/zh-CN/docs/Web/API/Navigator/buildID
 /zh-CN/docs/Web/API/Navigator.cookieEnabled	/zh-CN/docs/Web/API/Navigator/cookieEnabled
@@ -2191,7 +2192,8 @@
 /zh-CN/docs/Web/WebGL/Getting_started_with_WebGL	/zh-CN/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL
 /zh-CN/docs/Web/WebGL/用WebGL来画2D图形	/zh-CN/docs/Web/API/WebGL_API/Tutorial/Adding_2D_content_to_a_WebGL_context
 /zh-CN/docs/Web/Web_Components/Custom_Elements	/zh-CN/docs/Web/Web_Components/Using_custom_elements
-/zh-CN/docs/Web/Web_Components/HTML导入	/zh-CN/docs/Web/Web_Components/HTML_Imports
+/zh-CN/docs/Web/Web_Components/HTML_Imports	/zh-CN/docs/conflicting/Web/Web_Components
+/zh-CN/docs/Web/Web_Components/HTML导入	/zh-CN/docs/conflicting/Web/Web_Components
 /zh-CN/docs/Web/XSLT/Elements	/zh-CN/docs/Web/XSLT/Element
 /zh-CN/docs/Web/媒体	/zh-CN/docs/Web/Media
 /zh-CN/docs/Web/媒体/Autoplay_guide	/zh-CN/docs/Web/Media/Autoplay_guide
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 704de457fd..d0bbfa5ee4 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -17277,13 +17277,6 @@
       "teoli"
     ]
   },
-  "Web/API/MouseWheelEvent": {
-    "modified": "2019-03-23T23:38:38.526Z",
-    "contributors": [
-      "ziyunfei",
-      "teoli"
-    ]
-  },
   "Web/API/MutationObserver": {
     "modified": "2020-10-15T21:21:10.567Z",
     "contributors": [
@@ -46366,14 +46359,6 @@
       "Fantasy_shao"
     ]
   },
-  "Web/Web_Components/HTML_Imports": {
-    "modified": "2020-10-15T21:47:50.577Z",
-    "contributors": [
-      "2A5F",
-      "xgqfrms-GitHub",
-      "jchnxu"
-    ]
-  },
   "Web/Web_Components/Using_custom_elements": {
     "modified": "2020-08-13T09:13:52.060Z",
     "contributors": [
@@ -47330,6 +47315,13 @@
       "Carrie zhxj"
     ]
   },
+  "conflicting/Web/API/WheelEvent": {
+    "modified": "2019-03-23T23:38:38.526Z",
+    "contributors": [
+      "ziyunfei",
+      "teoli"
+    ]
+  },
   "conflicting/Web/API/Window": {
     "modified": "2019-01-16T17:02:20.467Z",
     "contributors": [
@@ -48021,6 +48013,14 @@
       "liminjun"
     ]
   },
+  "conflicting/Web/Web_Components": {
+    "modified": "2020-10-15T21:47:50.577Z",
+    "contributors": [
+      "2A5F",
+      "xgqfrms-GitHub",
+      "jchnxu"
+    ]
+  },
   "conflicting/Web/Web_Components/Using_shadow_DOM": {
     "modified": "2019-03-23T22:29:42.834Z",
     "contributors": [
diff --git a/files/zh-cn/web/api/mousewheelevent/index.html b/files/zh-cn/conflicting/web/api/wheelevent/index.html
index cc2d1e95ea..c5d60a279c 100644
--- a/files/zh-cn/web/api/mousewheelevent/index.html
+++ b/files/zh-cn/conflicting/web/api/wheelevent/index.html
@@ -1,7 +1,8 @@
 ---
 title: MouseWheelEvent
-slug: Web/API/MouseWheelEvent
+slug: conflicting/Web/API/WheelEvent
 translation_of: Web/API/MouseWheelEvent
+original_slug: Web/API/MouseWheelEvent
 ---
 <p>{{APIRef("DOM Events")}}{{ Non-standard_header() }}{{deprecated_header}}</p>
 
diff --git a/files/zh-cn/web/web_components/html_imports/index.html b/files/zh-cn/conflicting/web/web_components/index.html
index c9cc5bd9a0..2196d5894b 100644
--- a/files/zh-cn/web/web_components/html_imports/index.html
+++ b/files/zh-cn/conflicting/web/web_components/index.html
@@ -1,11 +1,11 @@
 ---
 title: HTML 导入（HTML Imports）
-slug: Web/Web_Components/HTML_Imports
+slug: conflicting/Web/Web_Components
 tags:
   - HTML Imports
   - Web Components
 translation_of: Web/Web_Components/HTML_Imports
-original_slug: Web/Web_Components/HTML导入
+original_slug: Web/Web_Components/HTML_Imports
 ---
 <p>{{DefaultAPISidebar("Web Components")}}</p>