[CRON] sync translated content

6 files changed, 46 insertions, 39 deletions

diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index ce34e4236f..6a81ba4b59 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -121,7 +121,7 @@
 /zh-CN/docs/CSS/动画	/zh-CN/docs/Web/CSS/animation
 /zh-CN/docs/CSS/开始/Content	/zh-CN/docs/Learn/CSS/Howto/Generated_content
 /zh-CN/docs/CSS/开始/SVG_and_CSS	/zh-CN/docs/Web/SVG/Tutorial/SVG_and_CSS
-/zh-CN/docs/CSS/开始/媒体	/zh-CN/docs/Web/Progressive_web_apps/Responsive/Media_types
+/zh-CN/docs/CSS/开始/媒体	/zh-CN/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
 /zh-CN/docs/CSS:Getting_Started:Content	/zh-CN/docs/Learn/CSS/Howto/Generated_content
 /zh-CN/docs/CSS:Media:Visual	/zh-CN/docs/Web/CSS/@media
 /zh-CN/docs/CSS:background	/zh-CN/docs/Web/CSS/background
@@ -1270,6 +1270,8 @@
 /zh-CN/docs/Web/API/DocumentOrShadowRoot/getSelection	/zh-CN/docs/Web/API/Document/getSelection
 /zh-CN/docs/Web/API/DocumentOrShadowRoot/pointerLockElement	/zh-CN/docs/Web/API/Document/pointerLockElement
 /zh-CN/docs/Web/API/DocumentOrShadowRoot/styleSheets	/zh-CN/docs/Web/API/Document/styleSheets
+/zh-CN/docs/Web/API/EffectTiming	/zh-CN/docs/conflicting/Web/API/KeyframeEffect/KeyframeEffect
+/zh-CN/docs/Web/API/EffectTiming/easing	/zh-CN/docs/Web/API/KeyframeEffect/KeyframeEffect
 /zh-CN/docs/Web/API/Element.classList	/zh-CN/docs/Web/API/Element/classList
 /zh-CN/docs/Web/API/Element.className	/zh-CN/docs/Web/API/Element/className
 /zh-CN/docs/Web/API/Element.clientLeft	/zh-CN/docs/Web/API/Element/clientLeft
@@ -1452,6 +1454,7 @@
 /zh-CN/docs/Web/API/PositionError	/zh-CN/docs/Web/API/GeolocationPositionError
 /zh-CN/docs/Web/API/PositionOptions	/zh-CN/docs/conflicting/Web/API/Geolocation/getCurrentPosition
 /zh-CN/docs/Web/API/PositionOptions/timeout	/zh-CN/docs/conflicting/Web/API/Geolocation/getCurrentPosition_058087067b28ad25fff974fd59827fb6
+/zh-CN/docs/Web/API/RTCConfiguration	/zh-CN/docs/conflicting/Web/API/RTCPeerConnection/RTCPeerConnection
 /zh-CN/docs/Web/API/RandomSource/getRandomValues	/zh-CN/docs/Web/API/Crypto/getRandomValues
 /zh-CN/docs/Web/API/Response/克隆	/zh-CN/docs/Web/API/Response/clone
 /zh-CN/docs/Web/API/SVGPathElement/getTotalLength	/zh-CN/docs/Web/API/SVGGeometryElement/getTotalLength
@@ -1789,7 +1792,7 @@
 /zh-CN/docs/Web/CSS/实际值	/zh-CN/docs/Web/CSS/actual_value
 /zh-CN/docs/Web/CSS/开始/Content	/zh-CN/docs/Learn/CSS/Howto/Generated_content
 /zh-CN/docs/Web/CSS/开始/SVG_and_CSS	/zh-CN/docs/Web/SVG/Tutorial/SVG_and_CSS
-/zh-CN/docs/Web/CSS/开始/媒体	/zh-CN/docs/Web/Progressive_web_apps/Responsive/Media_types
+/zh-CN/docs/Web/CSS/开始/媒体	/zh-CN/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
 /zh-CN/docs/Web/CSS/整型	/zh-CN/docs/Web/CSS/integer
 /zh-CN/docs/Web/CSS/文本修饰	/zh-CN/docs/Web/CSS/text-decoration
 /zh-CN/docs/Web/CSS/文本装饰线厚度(粗细)	/zh-CN/docs/Web/CSS/text-decoration-thickness
@@ -1890,9 +1893,9 @@
 /zh-CN/docs/Web/Guide/CSS/Consistent_list_indentation	/zh-CN/docs/Web/CSS/CSS_Lists_and_Counters/Consistent_list_indentation
 /zh-CN/docs/Web/Guide/CSS/Counters	/zh-CN/docs/Web/CSS/CSS_Lists_and_Counters/Using_CSS_counters
 /zh-CN/docs/Web/Guide/CSS/Getting_started/Content	/zh-CN/docs/Learn/CSS/Howto/Generated_content
-/zh-CN/docs/Web/Guide/CSS/Getting_started/Media	/zh-CN/docs/Web/Progressive_web_apps/Responsive/Media_types
+/zh-CN/docs/Web/Guide/CSS/Getting_started/Media	/zh-CN/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
 /zh-CN/docs/Web/Guide/CSS/Getting_started/SVG_and_CSS	/zh-CN/docs/Web/SVG/Tutorial/SVG_and_CSS
-/zh-CN/docs/Web/Guide/CSS/Getting_started/媒体	/zh-CN/docs/Web/Progressive_web_apps/Responsive/Media_types
+/zh-CN/docs/Web/Guide/CSS/Getting_started/媒体	/zh-CN/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
 /zh-CN/docs/Web/Guide/CSS/Media_queries	/zh-CN/docs/Web/CSS/Media_Queries/Using_media_queries
 /zh-CN/docs/Web/Guide/CSS/Testing_media_queries	/zh-CN/docs/Web/CSS/Media_Queries/Testing_media_queries
 /zh-CN/docs/Web/Guide/CSS/Understanding_z_index	/zh-CN/docs/Web/CSS/CSS_Positioning/Understanding_z_index
@@ -2183,6 +2186,7 @@
 /zh-CN/docs/Web/JavaScript/重新认识js	/zh-CN/docs/Web/JavaScript/A_re-introduction_to_JavaScript
 /zh-CN/docs/Web/Media/Formats/视频编解码器	/zh-CN/docs/Web/Media/Formats/Video_codecs
 /zh-CN/docs/Web/Performance/浏览器渲染页面的工作原理	/zh-CN/docs/Web/Performance/How_browsers_work
+/zh-CN/docs/Web/Progressive_web_apps/Responsive/Media_types	/zh-CN/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
 /zh-CN/docs/Web/Progressive_web_apps/加载	/zh-CN/docs/Web/Progressive_web_apps/Loading
 /zh-CN/docs/Web/Progressive_web_apps/添加到主屏幕	/zh-CN/docs/Web/Progressive_web_apps/Add_to_home_screen
 /zh-CN/docs/Web/SVG/Attribute/文本锚点	/zh-CN/docs/Web/SVG/Attribute/text-anchor
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index e686e78005..621cc7ce23 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -11855,18 +11855,6 @@
       "rainliang65536"
     ]
   },
-  "Web/API/EffectTiming": {
-    "modified": "2020-10-15T22:30:45.773Z",
-    "contributors": [
-      "sideshowbarker"
-    ]
-  },
-  "Web/API/EffectTiming/easing": {
-    "modified": "2020-10-15T22:30:45.316Z",
-    "contributors": [
-      "qiufeihong2018"
-    ]
-  },
   "Web/API/Element": {
     "modified": "2020-10-15T21:04:09.528Z",
     "contributors": [
@@ -16576,6 +16564,12 @@
       "cuixiping"
     ]
   },
+  "Web/API/KeyframeEffect/KeyframeEffect": {
+    "modified": "2020-10-15T22:30:45.316Z",
+    "contributors": [
+      "qiufeihong2018"
+    ]
+  },
   "Web/API/LocalFileSystemSync": {
     "modified": "2019-03-23T22:09:04.520Z",
     "contributors": [
@@ -18809,12 +18803,6 @@
       "BettyCHEN"
     ]
   },
-  "Web/API/RTCConfiguration": {
-    "modified": "2019-03-23T22:18:59.231Z",
-    "contributors": [
-      "moshoujingli"
-    ]
-  },
   "Web/API/RTCDataChannel": {
     "modified": "2019-03-23T23:04:49.663Z",
     "contributors": [
@@ -44646,18 +44634,6 @@
       "githubxiaominge"
     ]
   },
-  "Web/Progressive_web_apps/Responsive/Media_types": {
-    "modified": "2019-03-23T23:12:04.497Z",
-    "contributors": [
-      "Robinx",
-      "Harvesty",
-      "jasonzhyan",
-      "ziyunfei",
-      "yeol",
-      "teoli",
-      "Chajn"
-    ]
-  },
   "Web/Progressive_web_apps/Responsive/responsive_design_building_blocks": {
     "modified": "2020-11-17T04:04:41.165Z",
     "contributors": [
@@ -47155,6 +47131,12 @@
       "Taoja"
     ]
   },
+  "conflicting/Web/API/KeyframeEffect/KeyframeEffect": {
+    "modified": "2020-10-15T22:30:45.773Z",
+    "contributors": [
+      "sideshowbarker"
+    ]
+  },
   "conflicting/Web/API/MouseEvent/altKey": {
     "modified": "2019-03-24T00:16:10.184Z",
     "contributors": [
@@ -47253,6 +47235,12 @@
       "hibernake"
     ]
   },
+  "conflicting/Web/API/RTCPeerConnection/RTCPeerConnection": {
+    "modified": "2019-03-23T22:18:59.231Z",
+    "contributors": [
+      "moshoujingli"
+    ]
+  },
   "conflicting/Web/API/StorageManager/estimate": {
     "modified": "2019-03-18T21:31:04.064Z",
     "contributors": [
@@ -47516,6 +47504,18 @@
       "lazurey"
     ]
   },
+  "conflicting/Web/CSS/Media_Queries/Using_media_queries": {
+    "modified": "2019-03-23T23:12:04.497Z",
+    "contributors": [
+      "Robinx",
+      "Harvesty",
+      "jasonzhyan",
+      "ziyunfei",
+      "yeol",
+      "teoli",
+      "Chajn"
+    ]
+  },
   "conflicting/Web/CSS/easing-function": {
     "modified": "2020-10-15T21:21:10.131Z",
     "contributors": [
diff --git a/files/zh-cn/web/api/effecttiming/index.html b/files/zh-cn/conflicting/web/api/keyframeeffect/keyframeeffect/index.html
index f0b2b7c289..54afe3285e 100644
--- a/files/zh-cn/web/api/effecttiming/index.html
+++ b/files/zh-cn/conflicting/web/api/keyframeeffect/keyframeeffect/index.html
@@ -1,6 +1,6 @@
 ---
 title: EffectTiming
-slug: Web/API/EffectTiming
+slug: conflicting/Web/API/KeyframeEffect/KeyframeEffect
 tags:
   - API
   - Animation
@@ -16,6 +16,7 @@ tags:
   - animate
   - web animations api
 translation_of: Web/API/EffectTiming
+original_slug: Web/API/EffectTiming
 ---
 <div>{{ SeeCompatTable() }}{{ APIRef("Web Animations") }}</div>
 
diff --git a/files/zh-cn/web/api/rtcconfiguration/index.html b/files/zh-cn/conflicting/web/api/rtcpeerconnection/rtcpeerconnection/index.html
index ace1a5c5b6..0d48c5aaa4 100644
--- a/files/zh-cn/web/api/rtcconfiguration/index.html
+++ b/files/zh-cn/conflicting/web/api/rtcpeerconnection/rtcpeerconnection/index.html
@@ -1,7 +1,8 @@
 ---
 title: RTCConfiguration
-slug: Web/API/RTCConfiguration
+slug: conflicting/Web/API/RTCPeerConnection/RTCPeerConnection
 translation_of: Web/API/RTCConfiguration
+original_slug: Web/API/RTCConfiguration
 ---
 <p>{{APIRef("WebRTC")}}{{draft}}</p>
 
diff --git a/files/zh-cn/web/progressive_web_apps/responsive/media_types/index.html b/files/zh-cn/conflicting/web/css/media_queries/using_media_queries/index.html
index aed512780b..cd416c970a 100644
--- a/files/zh-cn/web/progressive_web_apps/responsive/media_types/index.html
+++ b/files/zh-cn/conflicting/web/css/media_queries/using_media_queries/index.html
@@ -1,8 +1,8 @@
 ---
 title: 媒体
-slug: Web/Progressive_web_apps/Responsive/Media_types
+slug: conflicting/Web/CSS/Media_Queries/Using_media_queries
 translation_of: Web/Progressive_web_apps/Responsive/Media_types
-original_slug: Web/Guide/CSS/Getting_started/Media
+original_slug: Web/Progressive_web_apps/Responsive/Media_types
 ---
 <p>{{CSSTutorialTOC}} {{previousPage("/zh-CN/docs/Web/Guide/CSS/Getting_Started/Tables", "表格")}}</p>
 
diff --git a/files/zh-cn/web/api/effecttiming/easing/index.html b/files/zh-cn/web/api/keyframeeffect/keyframeeffect/index.html
index 0ee0bfea9f..08c21a6791 100644
--- a/files/zh-cn/web/api/effecttiming/easing/index.html
+++ b/files/zh-cn/web/api/keyframeeffect/keyframeeffect/index.html
@@ -1,7 +1,8 @@
 ---
 title: EffectTiming.easing
-slug: Web/API/EffectTiming/easing
+slug: Web/API/KeyframeEffect/KeyframeEffect
 translation_of: Web/API/EffectTiming/easing
+original_slug: Web/API/EffectTiming/easing
 ---
 <div>{{ SeeCompatTable() }}{{ APIRef("Web Animations") }}</div>