From 1ebe847839b1d7476c1690db2a3f500af99a6e27 Mon Sep 17 00:00:00 2001
From: MDN <actions@users.noreply.github.com>
Date: Fri, 24 Sep 2021 00:49:15 +0000
Subject: [CRON] sync translated content

---
 files/zh-cn/_redirects.txt                        |  5 +++--
 files/zh-cn/_wikihistory.json                     | 14 +++++++-------
 files/zh-cn/conflicting/web/api/window/index.html |  7 +++++++
 files/zh-cn/web/api/window/minimize/index.html    |  6 ------
 4 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 files/zh-cn/conflicting/web/api/window/index.html
 delete mode 100644 files/zh-cn/web/api/window/minimize/index.html

diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 42c3daf701..701804d446 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -444,7 +444,7 @@
 /zh-CN/docs/DOM/window.frameElement	/zh-CN/docs/Web/API/Window/frameElement
 /zh-CN/docs/DOM/window.length	/zh-CN/docs/Web/API/Window/length
 /zh-CN/docs/DOM/window.location	/zh-CN/docs/Web/API/Window/location
-/zh-CN/docs/DOM/window.minimize	/zh-CN/docs/Web/API/Window/minimize
+/zh-CN/docs/DOM/window.minimize	/zh-CN/docs/conflicting/Web/API/Window
 /zh-CN/docs/DOM/window.moveTo	/zh-CN/docs/Web/API/Window/moveTo
 /zh-CN/docs/DOM/window.mozAnimationStartTime	/zh-CN/docs/Web/API/Window/mozAnimationStartTIme
 /zh-CN/docs/DOM/window.navigator	/zh-CN/docs/Web/API/Window/navigator
@@ -1524,7 +1524,7 @@
 /zh-CN/docs/Web/API/Window.length	/zh-CN/docs/Web/API/Window/length
 /zh-CN/docs/Web/API/Window.location	/zh-CN/docs/Web/API/Window/location
 /zh-CN/docs/Web/API/Window.matchMedia	/zh-CN/docs/Web/API/Window/matchMedia
-/zh-CN/docs/Web/API/Window.minimize	/zh-CN/docs/Web/API/Window/minimize
+/zh-CN/docs/Web/API/Window.minimize	/zh-CN/docs/conflicting/Web/API/Window
 /zh-CN/docs/Web/API/Window.moveBy	/zh-CN/docs/Web/API/Window/moveBy
 /zh-CN/docs/Web/API/Window.moveTo	/zh-CN/docs/Web/API/Window/moveTo
 /zh-CN/docs/Web/API/Window.mozAnimationStartTime	/zh-CN/docs/Web/API/Window/mozAnimationStartTIme
@@ -1560,6 +1560,7 @@
 /zh-CN/docs/Web/API/Window/btoa	/zh-CN/docs/Web/API/btoa
 /zh-CN/docs/Web/API/Window/caches	/zh-CN/docs/Web/API/caches
 /zh-CN/docs/Web/API/Window/clearInterval	/zh-CN/docs/Web/API/clearInterval
+/zh-CN/docs/Web/API/Window/minimize	/zh-CN/docs/conflicting/Web/API/Window
 /zh-CN/docs/Web/API/Window/onbeforeunload	/zh-CN/docs/Web/API/WindowEventHandlers/onbeforeunload
 /zh-CN/docs/Web/API/Window/onhashchange	/zh-CN/docs/Web/API/WindowEventHandlers/onhashchange
 /zh-CN/docs/Web/API/Window/onpopstate	/zh-CN/docs/Web/API/WindowEventHandlers/onpopstate
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 66a84bde8c..704de457fd 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -23181,13 +23181,6 @@
       "FEhaoxinjie"
     ]
   },
-  "Web/API/Window/minimize": {
-    "modified": "2019-01-16T17:02:20.467Z",
-    "contributors": [
-      "teoli",
-      "ziyunfei"
-    ]
-  },
   "Web/API/Window/moveBy": {
     "modified": "2019-03-23T23:10:30.097Z",
     "contributors": [
@@ -47337,6 +47330,13 @@
       "Carrie zhxj"
     ]
   },
+  "conflicting/Web/API/Window": {
+    "modified": "2019-01-16T17:02:20.467Z",
+    "contributors": [
+      "teoli",
+      "ziyunfei"
+    ]
+  },
   "conflicting/Web/API/Window/localStorage": {
     "modified": "2019-03-23T22:25:01.381Z",
     "contributors": [
diff --git a/files/zh-cn/conflicting/web/api/window/index.html b/files/zh-cn/conflicting/web/api/window/index.html
new file mode 100644
index 0000000000..43c607cf27
--- /dev/null
+++ b/files/zh-cn/conflicting/web/api/window/index.html
@@ -0,0 +1,7 @@
+---
+title: window.minimize
+slug: conflicting/Web/API/Window
+translation_of: Web/API/Window/minimize
+original_slug: Web/API/Window/minimize
+---
+<p>{{APIRef}}让当前浏览器窗口最小化(可以通过调用{{ domxref("window.moveTo()") }}方法让窗口恢复正常显示).</p>
diff --git a/files/zh-cn/web/api/window/minimize/index.html b/files/zh-cn/web/api/window/minimize/index.html
deleted file mode 100644
index 64c28da15c..0000000000
--- a/files/zh-cn/web/api/window/minimize/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: window.minimize
-slug: Web/API/Window/minimize
-translation_of: Web/API/Window/minimize
----
-<p>{{APIRef}}让当前浏览器窗口最小化(可以通过调用{{ domxref("window.moveTo()") }}方法让窗口恢复正常显示).</p>
-- 
cgit v1.2.3-54-g00ecf