[CRON] sync translated content

18 files changed, 64 insertions, 54 deletions

diff --git a/files/de/_redirects.txt b/files/de/_redirects.txt
index 6a5b8a39f0..1e1a223b58 100644
--- a/files/de/_redirects.txt
+++ b/files/de/_redirects.txt
@@ -531,6 +531,7 @@
 /de/docs/Web/CSS/Pseudoklasse	/de/docs/Web/CSS/Pseudo-classes
 /de/docs/Web/CSS/Referenz	/de/docs/Web/CSS/Reference
 /de/docs/Web/CSS/Spezifität	/de/docs/Web/CSS/Specificity
+/de/docs/Web/CSS/Tools	/de/docs/conflicting/Web/CSS
 /de/docs/Web/CSS/Vererbung	/de/docs/Web/CSS/inheritance
 /de/docs/Web/CSS/Wertdefinitionssyntax	/de/docs/Web/CSS/Value_definition_syntax
 /de/docs/Web/CSS/attr	/de/docs/Web/CSS/attr()
diff --git a/files/de/_wikihistory.json b/files/de/_wikihistory.json
index 6e9006333c..6c44b44041 100644
--- a/files/de/_wikihistory.json
+++ b/files/de/_wikihistory.json
@@ -5602,13 +5602,6 @@
       "Sebastianz"
     ]
   },
-  "Web/CSS/Tools": {
-    "modified": "2019-03-23T22:43:38.676Z",
-    "contributors": [
-      "Sebastianz",
-      "creativenitish"
-    ]
-  },
   "Web/CSS/Tools/Linear-gradient_Generator": {
     "modified": "2019-03-23T22:43:38.482Z",
     "contributors": [
@@ -13590,6 +13583,13 @@
       "eminor"
     ]
   },
+  "conflicting/Web/CSS": {
+    "modified": "2019-03-23T22:43:38.676Z",
+    "contributors": [
+      "Sebastianz",
+      "creativenitish"
+    ]
+  },
   "conflicting/Web/CSS/::placeholder": {
     "modified": "2019-03-23T23:08:23.797Z",
     "contributors": [
diff --git a/files/de/web/css/tools/index.html b/files/de/conflicting/web/css/index.html
index f107c81ddb..0cdc9d3d44 100644
--- a/files/de/web/css/tools/index.html
+++ b/files/de/conflicting/web/css/index.html
@@ -1,9 +1,10 @@
 ---
 title: Tools
-slug: Web/CSS/Tools
+slug: conflicting/Web/CSS
 tags:
   - CSS
 translation_of: Web/CSS/Tools
+original_slug: Web/CSS/Tools
 ---
 <p>CSS bietet eine Reihe mächtiger Features, die knifflig in der Anwendung sein können oder eine Reihe von Parametern haben, sodass es hilfreich ist, diese während an ihnen gearbeitet wird, zu visualisieren. Dieses Seite bietet Links zu verschiedenen nützlichen Werkzeugen, die helfen, das CSS unter Verwendung dieser Features zu erstellen, um den Inhalt zu stylen.</p>
 
diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt
index 393d653e5f..144e880d55 100644
--- a/files/es/_redirects.txt
+++ b/files/es/_redirects.txt
@@ -1664,7 +1664,7 @@
 /es/docs/Web/CSS/Elemento_reemplazo	/es/docs/Web/CSS/Replaced_element
 /es/docs/Web/CSS/Especificidad	/es/docs/Web/CSS/Specificity
 /es/docs/Web/CSS/Gradiente	/es/docs/Web/CSS/gradient
-/es/docs/Web/CSS/Herramientas	/es/docs/Web/CSS/Tools
+/es/docs/Web/CSS/Herramientas	/es/docs/conflicting/Web/CSS
 /es/docs/Web/CSS/Introducción/Content	/es/docs/Learn/CSS/Howto/Generated_content
 /es/docs/Web/CSS/Introducción/Media	/es/docs/Web/Progressive_web_apps/Responsive/Media_types
 /es/docs/Web/CSS/Preguntas_frecuentes_sobre_CSS	/es/docs/Learn/CSS/Howto/CSS_FAQ
@@ -1681,6 +1681,7 @@
 /es/docs/Web/CSS/Selectores_hermanos_generales	/es/docs/Web/CSS/General_sibling_combinator
 /es/docs/Web/CSS/Sintaxis_definición_de_valor	/es/docs/Web/CSS/Value_definition_syntax
 /es/docs/Web/CSS/Texto_CSS	/es/docs/Web/CSS/CSS_Text
+/es/docs/Web/CSS/Tools	/es/docs/conflicting/Web/CSS
 /es/docs/Web/CSS/Transiciones_de_CSS	/es/docs/Web/CSS/CSS_Transitions/Using_CSS_transitions
 /es/docs/Web/CSS/Usando_animaciones_CSS	/es/docs/Web/CSS/CSS_Animations/Using_CSS_animations
 /es/docs/Web/CSS/Using_CSS_transforms	/es/docs/Web/CSS/CSS_Transforms/Using_CSS_transforms
diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json
index 3808f684eb..be405acc83 100644
--- a/files/es/_wikihistory.json
+++ b/files/es/_wikihistory.json
@@ -11192,12 +11192,6 @@
       "Derhks"
     ]
   },
-  "Web/CSS/Tools": {
-    "modified": "2019-03-23T22:28:04.142Z",
-    "contributors": [
-      "arturoblack"
-    ]
-  },
   "Web/CSS/Tutorials": {
     "modified": "2019-03-23T22:52:34.225Z",
     "contributors": [
@@ -21464,6 +21458,12 @@
       "Jeremie"
     ]
   },
+  "conflicting/Web/CSS": {
+    "modified": "2019-03-23T22:28:04.142Z",
+    "contributors": [
+      "arturoblack"
+    ]
+  },
   "conflicting/Web/CSS/::placeholder": {
     "modified": "2019-03-23T22:29:22.118Z",
     "contributors": [
diff --git a/files/es/web/css/tools/index.html b/files/es/conflicting/web/css/index.html
index 3ea9e20a3f..988256afbd 100644
--- a/files/es/web/css/tools/index.html
+++ b/files/es/conflicting/web/css/index.html
@@ -1,10 +1,10 @@
 ---
 title: Herramientas
-slug: Web/CSS/Tools
+slug: conflicting/Web/CSS
 tags:
   - CSS
 translation_of: Web/CSS/Tools
-original_slug: Web/CSS/Herramientas
+original_slug: Web/CSS/Tools
 ---
 <div> </div>
 
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index 0e2dca875d..2e6bf4cbba 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -4114,7 +4114,7 @@
 /fr/docs/Web/CSS/Média/Visuel	/fr/docs/Web/CSS/@media
 /fr/docs/Web/CSS/Média_Paginé	/fr/docs/Web/CSS/Paged_Media
 /fr/docs/Web/CSS/Média_paginés	/fr/docs/Web/CSS/Paged_Media
-/fr/docs/Web/CSS/Outils	/fr/docs/Web/CSS/Tools
+/fr/docs/Web/CSS/Outils	/fr/docs/conflicting/Web/CSS_c2c099599c0a58c69d1390033045f244
 /fr/docs/Web/CSS/Outils/Générateur_de_courbe_de_Bézier	/fr/docs/orphaned/Web/CSS/Tools/Cubic_Bezier_Generator
 /fr/docs/Web/CSS/Outils/Générateur_de_dégradés_linéaires	/fr/docs/Web/CSS/Tools/Linear-gradient_Generator
 /fr/docs/Web/CSS/Propriétés_raccourcies	/fr/docs/Web/CSS/Shorthand_properties
@@ -4150,6 +4150,7 @@
 /fr/docs/Web/CSS/Sélecteurs_descendant	/fr/docs/Web/CSS/Descendant_combinator
 /fr/docs/Web/CSS/Sélecteurs_enfant	/fr/docs/Web/CSS/Child_combinator
 /fr/docs/Web/CSS/Sélecteurs_universels	/fr/docs/Web/CSS/Universal_selectors
+/fr/docs/Web/CSS/Tools	/fr/docs/conflicting/Web/CSS_c2c099599c0a58c69d1390033045f244
 /fr/docs/Web/CSS/Tools/Cubic_Bezier_Generator	/fr/docs/orphaned/Web/CSS/Tools/Cubic_Bezier_Generator
 /fr/docs/Web/CSS/Tools/Générateur_de_courbe_de_Bézier	/fr/docs/orphaned/Web/CSS/Tools/Cubic_Bezier_Generator
 /fr/docs/Web/CSS/Tools/Générateur_de_dégradés_linéaires	/fr/docs/Web/CSS/Tools/Linear-gradient_Generator
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index ccfb379d40..121a997e06 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -25688,13 +25688,6 @@
       "FredB"
     ]
   },
-  "Web/CSS/Tools": {
-    "modified": "2019-04-06T13:47:45.843Z",
-    "contributors": [
-      "SphinxKnight",
-      "velvel53"
-    ]
-  },
   "Web/CSS/Tools/Linear-gradient_Generator": {
     "modified": "2019-04-06T13:48:01.466Z",
     "contributors": [
@@ -43607,6 +43600,13 @@
       "ThePrisoner"
     ]
   },
+  "conflicting/Web/CSS_c2c099599c0a58c69d1390033045f244": {
+    "modified": "2019-04-06T13:47:45.843Z",
+    "contributors": [
+      "SphinxKnight",
+      "velvel53"
+    ]
+  },
   "conflicting/Web/Guide": {
     "modified": "2019-03-24T00:13:07.123Z",
     "contributors": [
diff --git a/files/fr/web/css/tools/index.html b/files/fr/conflicting/web/css_c2c099599c0a58c69d1390033045f244/index.html
index ac24b6e9ee..84516f2356 100644
--- a/files/fr/web/css/tools/index.html
+++ b/files/fr/conflicting/web/css_c2c099599c0a58c69d1390033045f244/index.html
@@ -1,11 +1,11 @@
 ---
 title: Outils
-slug: Web/CSS/Tools
+slug: conflicting/Web/CSS_c2c099599c0a58c69d1390033045f244
 tags:
   - CSS
   - Outils
 translation_of: Web/CSS/Tools
-original_slug: Web/CSS/Outils
+original_slug: Web/CSS/Tools
 ---
 <p>CSS fournit de nombreuses fonctionnalités qui peuvent être paramétrées avec différents facteurs. Il est donc utile de pouvoir visualiser ces paramètres lorsqu'on manipule ces propriétés. Cette page indique différents outils qui pourront vous être utiles lorsque vous construirez vos feuilles de style avec ces fonctionnalités.</p>
 
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 6117892834..de680f387d 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3683,6 +3683,7 @@
 /ja/docs/Web/CSS/Reference/@viewport/zoom	/ja/docs/Web/CSS/@viewport
 /ja/docs/Web/CSS/Reference/Mozilla_Extensions	/ja/docs/Web/CSS/Mozilla_Extensions
 /ja/docs/Web/CSS/Scaling_background_images	/ja/docs/Web/CSS/CSS_Backgrounds_and_Borders/Resizing_background_images
+/ja/docs/Web/CSS/Tools	/ja/docs/conflicting/Web/CSS
 /ja/docs/Web/CSS/Understanding_z_index	/ja/docs/Web/CSS/CSS_Positioning/Understanding_z_index
 /ja/docs/Web/CSS/Understanding_z_index/Adding_z-index	/ja/docs/Web/CSS/CSS_Positioning/Understanding_z_index/Adding_z-index
 /ja/docs/Web/CSS/Understanding_z_index/Stacking_and_float	/ja/docs/Web/CSS/CSS_Positioning/Understanding_z_index/Stacking_and_float
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 71a15c0761..44f4c575d1 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -29309,13 +29309,6 @@
       "sii"
     ]
   },
-  "Web/CSS/Tools": {
-    "modified": "2020-07-21T12:48:32.485Z",
-    "contributors": [
-      "mfuji09",
-      "sii"
-    ]
-  },
   "Web/CSS/Type_selectors": {
     "modified": "2020-10-15T21:20:42.015Z",
     "contributors": [
@@ -48609,6 +48602,13 @@
       "Jeremie"
     ]
   },
+  "conflicting/Web/CSS": {
+    "modified": "2020-07-21T12:48:32.485Z",
+    "contributors": [
+      "mfuji09",
+      "sii"
+    ]
+  },
   "orphaned/Building_a_Mozilla_Distribution": {
     "modified": "2019-03-23T23:49:07.062Z",
     "contributors": [
diff --git a/files/ja/web/css/tools/index.html b/files/ja/conflicting/web/css/index.html
index fb51e9d15d..9585f457ed 100644
--- a/files/ja/web/css/tools/index.html
+++ b/files/ja/conflicting/web/css/index.html
@@ -1,12 +1,13 @@
 ---
 title: ツール
-slug: Web/CSS/Tools
+slug: conflicting/Web/CSS
 tags:
   - CSS
   - Guide
   - NeedsUpdate
   - ガイド
 translation_of: Web/CSS/Tools
+original_slug: Web/CSS/Tools
 ---
 <div></div>
 
diff --git a/files/pt-br/_redirects.txt b/files/pt-br/_redirects.txt
index d8fbb3ee68..c8c1a6bb45 100644
--- a/files/pt-br/_redirects.txt
+++ b/files/pt-br/_redirects.txt
@@ -593,6 +593,7 @@
 /pt-BR/docs/Web/CSS/Seletor_universal	/pt-BR/docs/Web/CSS/Universal_selectors
 /pt-BR/docs/Web/CSS/Seletores_CSS	/pt-BR/docs/Web/CSS/CSS_Selectors
 /pt-BR/docs/Web/CSS/Sintexe_valor	/pt-BR/docs/Web/CSS/Value_definition_syntax
+/pt-BR/docs/Web/CSS/Tools	/pt-BR/docs/conflicting/Web/CSS
 /pt-BR/docs/Web/CSS/Tools/Border-image_generator	/pt-BR/docs/Web/CSS/CSS_Backgrounds_and_Borders/Border-image_generator
 /pt-BR/docs/Web/CSS/Tools/Border-radius_generator	/pt-BR/docs/Web/CSS/CSS_Backgrounds_and_Borders/Border-radius_generator
 /pt-BR/docs/Web/CSS/Using_CSS_variables	/pt-BR/docs/Web/CSS/Using_CSS_custom_properties
diff --git a/files/pt-br/_wikihistory.json b/files/pt-br/_wikihistory.json
index 2c13008b4e..d9f57768b3 100644
--- a/files/pt-br/_wikihistory.json
+++ b/files/pt-br/_wikihistory.json
@@ -7981,13 +7981,6 @@
       "fvargaspf@gmail.com"
     ]
   },
-  "Web/CSS/Tools": {
-    "modified": "2019-03-23T23:07:41.210Z",
-    "contributors": [
-      "hlays",
-      "velvel53"
-    ]
-  },
   "Web/CSS/Type_selectors": {
     "modified": "2020-10-15T22:32:30.449Z",
     "contributors": [
@@ -16469,6 +16462,13 @@
       "caio.rrs"
     ]
   },
+  "conflicting/Web/CSS": {
+    "modified": "2019-03-23T23:07:41.210Z",
+    "contributors": [
+      "hlays",
+      "velvel53"
+    ]
+  },
   "conflicting/Web/CSS/CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox": {
     "modified": "2019-09-08T09:50:19.292Z",
     "contributors": [
diff --git a/files/pt-br/web/css/tools/index.html b/files/pt-br/conflicting/web/css/index.html
index 2e17ae96d5..82fa64bdf2 100644
--- a/files/pt-br/web/css/tools/index.html
+++ b/files/pt-br/conflicting/web/css/index.html
@@ -1,10 +1,11 @@
 ---
 title: Ferramentas
-slug: Web/CSS/Tools
+slug: conflicting/Web/CSS
 tags:
   - CSS
   - NeedsContent
 translation_of: Web/CSS/Tools
+original_slug: Web/CSS/Tools
 ---
 <div>{{Draft}}</div>
 
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index f625f0a1c0..c9a3dcc7c3 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1714,6 +1714,7 @@
 /zh-CN/docs/Web/CSS/Reference/Webkit_Extensions	/zh-CN/docs/Web/CSS/WebKit_Extensions
 /zh-CN/docs/Web/CSS/Reference/background-blend-mode	/zh-CN/docs/Web/CSS/background-blend-mode
 /zh-CN/docs/Web/CSS/Reference/mix-blend-mode	/zh-CN/docs/Web/CSS/mix-blend-mode
+/zh-CN/docs/Web/CSS/Tools	/zh-CN/docs/conflicting/Web/CSS
 /zh-CN/docs/Web/CSS/Tutorials/Using_CSS_transforms	/zh-CN/docs/Web/CSS/CSS_Transforms/Using_CSS_transforms
 /zh-CN/docs/Web/CSS/Understanding_z-index	/zh-CN/docs/Web/CSS/CSS_Positioning/Understanding_z_index
 /zh-CN/docs/Web/CSS/Understanding_z-index/Adding_z-index	/zh-CN/docs/Web/CSS/CSS_Positioning/Understanding_z_index/Adding_z-index
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index f4f8937676..3e599cf40f 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -27262,16 +27262,6 @@
       "yan"
     ]
   },
-  "Web/CSS/Tools": {
-    "modified": "2019-03-23T22:29:45.280Z",
-    "contributors": [
-      "runyul",
-      "pluwen",
-      "edwards1101",
-      "lucia007",
-      "lunix01"
-    ]
-  },
   "Web/CSS/Tutorials": {
     "modified": "2019-03-23T23:32:32.218Z",
     "contributors": [
@@ -47394,6 +47384,16 @@
       "qianzhangcheng"
     ]
   },
+  "conflicting/Web/CSS": {
+    "modified": "2019-03-23T22:29:45.280Z",
+    "contributors": [
+      "runyul",
+      "pluwen",
+      "edwards1101",
+      "lucia007",
+      "lunix01"
+    ]
+  },
   "conflicting/Web/CSS/::placeholder": {
     "modified": "2019-03-23T23:21:18.757Z",
     "contributors": [
diff --git a/files/zh-cn/web/css/tools/index.html b/files/zh-cn/conflicting/web/css/index.html
index a4c348fb36..007a716edb 100644
--- a/files/zh-cn/web/css/tools/index.html
+++ b/files/zh-cn/conflicting/web/css/index.html
@@ -1,9 +1,10 @@
 ---
 title: 工具
-slug: Web/CSS/Tools
+slug: conflicting/Web/CSS
 tags:
   - CSS
 translation_of: Web/CSS/Tools
+original_slug: Web/CSS/Tools
 ---
 <div>CSS提供了许多强大的功能，但这些功能要么可能很难使用，要么有许多参数，因此在使用它们时，能够可视化它们是有帮助的。此页面提供了一些有用的工具的链接，这些工具将帮助您使用这些功能构建 CSS 来设计您的内容。</div>