From b598325e21f9761198106a1e78b06b7b002399a4 Mon Sep 17 00:00:00 2001
From: MDN <actions@users.noreply.github.com>
Date: Sat, 13 Nov 2021 00:48:29 +0000
Subject: [CRON] sync translated content

---
 files/zh-cn/_redirects.txt                         |  1 +
 files/zh-cn/_wikihistory.json                      | 12 ++---
 files/zh-cn/conflicting/web/api/caches/index.html  | 53 ++++++++++++++++++++++
 .../api/serviceworkerglobalscope/caches/index.html | 52 ---------------------
 4 files changed, 60 insertions(+), 58 deletions(-)
 create mode 100644 files/zh-cn/conflicting/web/api/caches/index.html
 delete mode 100644 files/zh-cn/web/api/serviceworkerglobalscope/caches/index.html

(limited to 'files/zh-cn')

diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index bd9da62df6..8c20e77a7b 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1477,6 +1477,7 @@
 /zh-CN/docs/Web/API/Selection.isCollapsed	/zh-CN/docs/Web/API/Selection/isCollapsed
 /zh-CN/docs/Web/API/Selection.removeRange	/zh-CN/docs/Web/API/Selection/removeRange
 /zh-CN/docs/Web/API/Selection/从Document中删除	/zh-CN/docs/Web/API/Selection/deleteFromDocument
+/zh-CN/docs/Web/API/ServiceWorkerGlobalScope/caches	/zh-CN/docs/conflicting/Web/API/caches
 /zh-CN/docs/Web/API/StorageEstimate	/zh-CN/docs/conflicting/Web/API/StorageManager/estimate
 /zh-CN/docs/Web/API/Streams_API/使用可读文件流	/zh-CN/docs/Web/API/Streams_API/Using_readable_streams
 /zh-CN/docs/Web/API/Streams_API/概念	/zh-CN/docs/Web/API/Streams_API/Concepts
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 5aa50df6f9..d92c883026 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -19903,12 +19903,6 @@
       "TimLuo465"
     ]
   },
-  "Web/API/ServiceWorkerGlobalScope/caches": {
-    "modified": "2020-10-28T03:25:10.149Z",
-    "contributors": [
-      "peter006qi"
-    ]
-  },
   "Web/API/ServiceWorkerRegistration": {
     "modified": "2019-03-23T22:12:58.327Z",
     "contributors": [
@@ -47333,6 +47327,12 @@
       "AlexChao"
     ]
   },
+  "conflicting/Web/API/caches": {
+    "modified": "2020-10-28T03:25:10.149Z",
+    "contributors": [
+      "peter006qi"
+    ]
+  },
   "conflicting/Web/API_dd04ca1265cb79b990b8120e5f5070d3": {
     "modified": "2019-03-18T20:42:39.198Z",
     "contributors": [
diff --git a/files/zh-cn/conflicting/web/api/caches/index.html b/files/zh-cn/conflicting/web/api/caches/index.html
new file mode 100644
index 0000000000..0da1e450bc
--- /dev/null
+++ b/files/zh-cn/conflicting/web/api/caches/index.html
@@ -0,0 +1,53 @@
+---
+title: ServiceWorkerGlobalScope.caches
+slug: conflicting/Web/API/caches
+translation_of: Web/API/ServiceWorkerGlobalScope/caches
+original_slug: Web/API/ServiceWorkerGlobalScope/caches
+---
+<p>{{APIRef("Service Workers API")}}</p>
+
+<p><strong><code>caches </code></strong>是一个 {{domxref("ServiceWorkerGlobalScope")}} 接口的只读属性，返回与当前service worker相关联的{{domxref("CacheStorage")}}对象。</p>
+
+<h2 id="语法">语法</h2>
+
+<pre class="syntaxbox notranslate">var <em>myCacheStorage</em> = self.caches;
+</pre>
+
+<h3 id="返回值">返回值</h3>
+
+<p>一个 {{domxref("CacheStorage")}} 对象。</p>
+
+<h2 id="规范">规范</h2>
+
+<table class="standard-table">
+ <tbody>
+  <tr>
+   <th scope="col">规范</th>
+   <th scope="col">状态</th>
+   <th scope="col">备注</th>
+  </tr>
+  <tr>
+   <td>{{SpecName('Service Workers', '#global-caches', 'ServiceWorkerGlobalScope.caches')}}</td>
+   <td>{{Spec2('Service Workers')}}</td>
+   <td>Initial definition.</td>
+  </tr>
+ </tbody>
+</table>
+
+<h2 id="浏览器兼容性">浏览器兼容性</h2>
+
+<div>
+
+
+<p>{{Compat("api.ServiceWorkerGlobalScope.caches")}}</p>
+</div>
+
+<h2 id="参见">参见</h2>
+
+<ul>
+ <li><a href="/en-US/docs/Web/API/Service_Worker_API/Using_Service_Workers">Using Service Workers</a></li>
+ <li><a href="https://github.com/mdn/sw-test">Service workers basic code example</a></li>
+ <li><a href="https://jakearchibald.github.io/isserviceworkerready/">Is ServiceWorker ready?</a></li>
+ <li>{{jsxref("Promise")}}</li>
+ <li><a href="/en-US/docs/Web/API/Web_Workers_API/Using_web_workers">Using web workers</a></li>
+</ul>
diff --git a/files/zh-cn/web/api/serviceworkerglobalscope/caches/index.html b/files/zh-cn/web/api/serviceworkerglobalscope/caches/index.html
deleted file mode 100644
index bead85ce7c..0000000000
--- a/files/zh-cn/web/api/serviceworkerglobalscope/caches/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
----
-title: ServiceWorkerGlobalScope.caches
-slug: Web/API/ServiceWorkerGlobalScope/caches
-translation_of: Web/API/ServiceWorkerGlobalScope/caches
----
-<p>{{APIRef("Service Workers API")}}</p>
-
-<p><strong><code>caches </code></strong>是一个 {{domxref("ServiceWorkerGlobalScope")}} 接口的只读属性，返回与当前service worker相关联的{{domxref("CacheStorage")}}对象。</p>
-
-<h2 id="语法">语法</h2>
-
-<pre class="syntaxbox notranslate">var <em>myCacheStorage</em> = self.caches;
-</pre>
-
-<h3 id="返回值">返回值</h3>
-
-<p>一个 {{domxref("CacheStorage")}} 对象。</p>
-
-<h2 id="规范">规范</h2>
-
-<table class="standard-table">
- <tbody>
-  <tr>
-   <th scope="col">规范</th>
-   <th scope="col">状态</th>
-   <th scope="col">备注</th>
-  </tr>
-  <tr>
-   <td>{{SpecName('Service Workers', '#global-caches', 'ServiceWorkerGlobalScope.caches')}}</td>
-   <td>{{Spec2('Service Workers')}}</td>
-   <td>Initial definition.</td>
-  </tr>
- </tbody>
-</table>
-
-<h2 id="浏览器兼容性">浏览器兼容性</h2>
-
-<div>
-
-
-<p>{{Compat("api.ServiceWorkerGlobalScope.caches")}}</p>
-</div>
-
-<h2 id="参见">参见</h2>
-
-<ul>
- <li><a href="/en-US/docs/Web/API/Service_Worker_API/Using_Service_Workers">Using Service Workers</a></li>
- <li><a href="https://github.com/mdn/sw-test">Service workers basic code example</a></li>
- <li><a href="https://jakearchibald.github.io/isserviceworkerready/">Is ServiceWorker ready?</a></li>
- <li>{{jsxref("Promise")}}</li>
- <li><a href="/en-US/docs/Web/API/Web_Workers_API/Using_web_workers">Using web workers</a></li>
-</ul>
-- 
cgit v1.2.3-54-g00ecf