[CRON] sync translated content

9 files changed, 41 insertions, 36 deletions

diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt
index ed54c3c834..a6ec4b3ea8 100644
--- a/files/es/_redirects.txt
+++ b/files/es/_redirects.txt
@@ -1197,9 +1197,9 @@
 /es/docs/Localización	/es/docs/Glossary/Localization
 /es/docs/MDN/Comenzando	/es/docs/MDN/Contribute/Getting_started
 /es/docs/MDN/Contribute/Content	/es/docs/MDN/Guidelines
-/es/docs/MDN/Contribute/Content/Content_blocks	/es/docs/MDN/Guidelines/CSS_style_guide
+/es/docs/MDN/Contribute/Content/Content_blocks	/es/docs/MDN/Contribute/Markdown_in_MDN
 /es/docs/MDN/Contribute/Guidelines	/es/docs/MDN/Guidelines
-/es/docs/MDN/Contribute/Guidelines/Content_blocks	/es/docs/MDN/Guidelines/CSS_style_guide
+/es/docs/MDN/Contribute/Guidelines/Content_blocks	/es/docs/MDN/Contribute/Markdown_in_MDN
 /es/docs/MDN/Contribute/Guidelines/Convenciones_y_definiciones	/es/docs/MDN/Guidelines/Conventions_definitions
 /es/docs/MDN/Contribute/Guidelines/Project:Guía_de_estilo	/es/docs/MDN/Guidelines/Writing_style_guide
 /es/docs/MDN/Contribute/Herramientas	/es/docs/MDN/Tools
@@ -1211,7 +1211,8 @@
 /es/docs/MDN/Contribute/Structures/Macros/Otras	/es/docs/MDN/Structures/Macros/Other
 /es/docs/MDN/Contribute/Structures/Tablas_de_compatibilidad	/es/docs/MDN/Structures/Compatibility_tables
 /es/docs/MDN/Enviar_feedback_sobre_MDN	/es/docs/MDN/Contribute/Feedback
-/es/docs/MDN/Guidelines/Content_blocks	/es/docs/MDN/Guidelines/CSS_style_guide
+/es/docs/MDN/Guidelines/CSS_style_guide	/es/docs/MDN/Contribute/Markdown_in_MDN
+/es/docs/MDN/Guidelines/Content_blocks	/es/docs/MDN/Contribute/Markdown_in_MDN
 /es/docs/MDN/Guidelines/Convenciones_y_definiciones	/es/docs/MDN/Guidelines/Conventions_definitions
 /es/docs/MDN/Guidelines/Project:Guía_de_estilo	/es/docs/MDN/Guidelines/Writing_style_guide
 /es/docs/MDN/Kuma	/es/docs/MDN/Yari
diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json
index 1d531642a3..5e2edb6bb7 100644
--- a/files/es/_wikihistory.json
+++ b/files/es/_wikihistory.json
@@ -3787,6 +3787,15 @@
       "L_e_o"
     ]
   },
+  "MDN/Contribute/Markdown_in_MDN": {
+    "modified": "2020-09-30T15:28:56.171Z",
+    "contributors": [
+      "chrisdavidmills",
+      "wbamberg",
+      "Jeremie",
+      "LeoHirsch"
+    ]
+  },
   "MDN/Contribute/Processes": {
     "modified": "2019-01-17T02:12:44.469Z",
     "contributors": [
@@ -3803,15 +3812,6 @@
       "LeoHirsch"
     ]
   },
-  "MDN/Guidelines/CSS_style_guide": {
-    "modified": "2020-09-30T15:28:56.171Z",
-    "contributors": [
-      "chrisdavidmills",
-      "wbamberg",
-      "Jeremie",
-      "LeoHirsch"
-    ]
-  },
   "MDN/Guidelines/Conventions_definitions": {
     "modified": "2020-09-30T15:28:56.412Z",
     "contributors": [
diff --git a/files/es/mdn/guidelines/css_style_guide/index.html b/files/es/mdn/contribute/markdown_in_mdn/index.html
index 17e58b0086..2e828a2be8 100644
--- a/files/es/mdn/guidelines/css_style_guide/index.html
+++ b/files/es/mdn/contribute/markdown_in_mdn/index.html
@@ -1,12 +1,12 @@
 ---
 title: Bloques de contenido
-slug: MDN/Guidelines/CSS_style_guide
+slug: MDN/Contribute/Markdown_in_MDN
 tags:
   - MDN
   - Meta
 translation_of: MDN/Guidelines/CSS_style_guide
 translation_of_original: MDN/Structures/Content_blocks
-original_slug: MDN/Guidelines/Content_blocks
+original_slug: MDN/Guidelines/CSS_style_guide
 ---
 <div>{{MDNSidebar}}</div><div class="summary">
  <p>This pages lists reusable content blocks.</p>
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 799f06be84..1214001898 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -2712,13 +2712,13 @@
 /ja/docs/MDN/Community/Working_in_community	/ja/docs/orphaned/MDN/Community/Working_in_community
 /ja/docs/MDN/Contribute/Content	/ja/docs/MDN/Guidelines
 /ja/docs/MDN/Contribute/Content/Best_practices	/ja/docs/MDN/Guidelines/Conventions_definitions
-/ja/docs/MDN/Contribute/Content/CSS_style_guide	/ja/docs/MDN/Guidelines/CSS_style_guide
+/ja/docs/MDN/Contribute/Content/CSS_style_guide	/ja/docs/conflicting/MDN/Contribute/Markdown_in_MDN
 /ja/docs/MDN/Contribute/Content/Does_this_belong_on_MDN	/ja/docs/MDN/Guidelines/Does_this_belong_on_MDN
 /ja/docs/MDN/Contribute/Content/Writing_style_guide	/ja/docs/MDN/Guidelines/Writing_style_guide
 /ja/docs/MDN/Contribute/FAQ	/ja/docs/MDN/Contribute
 /ja/docs/MDN/Contribute/Guidelines	/ja/docs/MDN/Guidelines
 /ja/docs/MDN/Contribute/Guidelines/Best_practices	/ja/docs/MDN/Guidelines/Conventions_definitions
-/ja/docs/MDN/Contribute/Guidelines/CSS_style_guide	/ja/docs/MDN/Guidelines/CSS_style_guide
+/ja/docs/MDN/Contribute/Guidelines/CSS_style_guide	/ja/docs/conflicting/MDN/Contribute/Markdown_in_MDN
 /ja/docs/MDN/Contribute/Guidelines/Code_guidelines	/ja/docs/MDN/Guidelines/Code_guidelines
 /ja/docs/MDN/Contribute/Guidelines/Code_guidelines/CSS	/ja/docs/MDN/Guidelines/Code_guidelines/CSS
 /ja/docs/MDN/Contribute/Guidelines/Code_guidelines/General	/ja/docs/MDN/Guidelines/Code_guidelines/General
@@ -2756,6 +2756,7 @@
 /ja/docs/MDN/Contribute/Tools/Sample_server	/ja/docs/MDN/Tools/Sample_server
 /ja/docs/MDN/Feedback	/ja/docs/MDN/Contribute/Feedback
 /ja/docs/MDN/Getting_started	/ja/docs/MDN/Contribute/Getting_started
+/ja/docs/MDN/Guidelines/CSS_style_guide	/ja/docs/conflicting/MDN/Contribute/Markdown_in_MDN
 /ja/docs/MDN/Kuma	/ja/docs/MDN/Yari
 /ja/docs/MDN/Structures/API_references	/ja/docs/orphaned/MDN/Structures/API_references
 /ja/docs/MDN/Structures/API_references/API_reference_sidebars	/ja/docs/MDN/Contribute/Howto/Write_an_API_reference/Sidebars
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index fa823b71c6..98095b7958 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -6237,16 +6237,6 @@
       "hamasaki"
     ]
   },
-  "MDN/Guidelines/CSS_style_guide": {
-    "modified": "2020-09-30T15:30:25.061Z",
-    "contributors": [
-      "chrisdavidmills",
-      "mfuji09",
-      "silverskyvicto",
-      "wbamberg",
-      "Uemmra3"
-    ]
-  },
   "MDN/Guidelines/Code_guidelines": {
     "modified": "2020-09-30T15:30:24.568Z",
     "contributors": [
@@ -48529,6 +48519,16 @@
       "silverskyvicto"
     ]
   },
+  "conflicting/MDN/Contribute/Markdown_in_MDN": {
+    "modified": "2020-09-30T15:30:25.061Z",
+    "contributors": [
+      "chrisdavidmills",
+      "mfuji09",
+      "silverskyvicto",
+      "wbamberg",
+      "Uemmra3"
+    ]
+  },
   "conflicting/Web/API/Blob/size": {
     "modified": "2020-09-25T16:46:05.461Z",
     "contributors": [
diff --git a/files/ja/mdn/guidelines/css_style_guide/index.html b/files/ja/conflicting/mdn/contribute/markdown_in_mdn/index.html
index 6aa8dff5e9..f888931063 100644
--- a/files/ja/mdn/guidelines/css_style_guide/index.html
+++ b/files/ja/conflicting/mdn/contribute/markdown_in_mdn/index.html
@@ -1,6 +1,6 @@
 ---
 title: MDN のコンテンツで使われるクラスとスタイルのガイド
-slug: MDN/Guidelines/CSS_style_guide
+slug: conflicting/MDN/Contribute/Markdown_in_MDN
 tags:
   - Guide
   - MDN
@@ -10,6 +10,7 @@ tags:
   - クラス
   - スタイル
 translation_of: MDN/Guidelines/CSS_style_guide
+original_slug: MDN/Guidelines/CSS_style_guide
 ---
 <p>{{MDNSidebar}}</p>
 
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 5c69868bdc..bd9da62df6 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1109,7 +1109,7 @@
 /zh-CN/docs/Localization	/zh-CN/docs/Glossary/Localization
 /zh-CN/docs/MDN/CSS	/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperties
 /zh-CN/docs/MDN/Contribute/Content	/zh-CN/docs/MDN/Guidelines
-/zh-CN/docs/MDN/Contribute/Content/CSS_style_guide	/zh-CN/docs/MDN/Guidelines/CSS_style_guide
+/zh-CN/docs/MDN/Contribute/Content/CSS_style_guide	/zh-CN/docs/MDN/Contribute/Markdown_in_MDN
 /zh-CN/docs/MDN/Contribute/Content/Custom_macros	/zh-CN/docs/MDN/Structures/Macros/Commonly-used_macros
 /zh-CN/docs/MDN/Contribute/Content/Rules_Of_MDN_Documenting	/zh-CN/docs/MDN/Guidelines/Does_this_belong_on_MDN
 /zh-CN/docs/MDN/Contribute/Content/Style_guide	/zh-CN/docs/MDN/Guidelines/Writing_style_guide
@@ -1123,6 +1123,7 @@
 /zh-CN/docs/MDN/Contribute/Structures/Macros	/zh-CN/docs/MDN/Structures/Macros
 /zh-CN/docs/MDN/Feedback	/zh-CN/docs/MDN/Contribute/Feedback
 /zh-CN/docs/MDN/Getting_started	/zh-CN/docs/MDN/Contribute/Getting_started
+/zh-CN/docs/MDN/Guidelines/CSS_style_guide	/zh-CN/docs/MDN/Contribute/Markdown_in_MDN
 /zh-CN/docs/MDN/Guidelines/Rules_Of_MDN_Documenting	/zh-CN/docs/MDN/Guidelines/Does_this_belong_on_MDN
 /zh-CN/docs/MDN/Guidelines/Style_guide	/zh-CN/docs/MDN/Guidelines/Writing_style_guide
 /zh-CN/docs/MDN/JavaScript	/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/Object/create
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 88c5dd775d..5aa50df6f9 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -5309,6 +5309,13 @@
       "MartinJLiu"
     ]
   },
+  "MDN/Contribute/Markdown_in_MDN": {
+    "modified": "2020-09-30T15:32:47.524Z",
+    "contributors": [
+      "chrisdavidmills",
+      "shc0743"
+    ]
+  },
   "MDN/Guidelines": {
     "modified": "2020-09-30T15:32:46.472Z",
     "contributors": [
@@ -5321,13 +5328,6 @@
       "Sheppy"
     ]
   },
-  "MDN/Guidelines/CSS_style_guide": {
-    "modified": "2020-09-30T15:32:47.524Z",
-    "contributors": [
-      "chrisdavidmills",
-      "shc0743"
-    ]
-  },
   "MDN/Guidelines/Does_this_belong_on_MDN": {
     "modified": "2020-09-30T15:32:46.957Z",
     "contributors": [
diff --git a/files/zh-cn/mdn/guidelines/css_style_guide/index.html b/files/zh-cn/mdn/contribute/markdown_in_mdn/index.html
index 4784a5682d..fa4bb4ff6e 100644
--- a/files/zh-cn/mdn/guidelines/css_style_guide/index.html
+++ b/files/zh-cn/mdn/contribute/markdown_in_mdn/index.html
@@ -1,7 +1,8 @@
 ---
 title: MDN样式指南
-slug: MDN/Guidelines/CSS_style_guide
+slug: MDN/Contribute/Markdown_in_MDN
 translation_of: MDN/Guidelines/CSS_style_guide
+original_slug: MDN/Guidelines/CSS_style_guide
 ---
 <p>MDN有许多内置的全局样式，可以在设置文章样式和布局文章时使用，本文是可用类以及何时使用它们的指南。其中一些样式可以通过MDN编辑器的工具栏访问。在这种情况下，我们将在样式标题下包含短语“编辑工具栏”，以及相关工具栏按钮的图像。</p>