[CRON] sync translated content

6 files changed, 18 insertions, 14 deletions

diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 8e84bae6f8..5f7cc61fb8 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3242,6 +3242,7 @@
 /ja/docs/Web/API/Response/useFinalURL	/ja/docs/orphaned/Web/API/Response/useFinalURL
 /ja/docs/Web/API/SVGTests	/ja/docs/orphaned/Web/API/SVGTests
 /ja/docs/Web/API/SVGTransformable	/ja/docs/orphaned/Web/API/SVGTransformable
+/ja/docs/Web/API/ScrollToOptions	/ja/docs/conflicting/Web/API/Window/scroll
 /ja/docs/Web/API/ServiceWorker_API	/ja/docs/Web/API/Service_Worker_API
 /ja/docs/Web/API/ServiceWorker_API/Using_Service_Workers	/ja/docs/Web/API/Service_Worker_API/Using_Service_Workers
 /ja/docs/Web/API/Slotable	/ja/docs/Web/API/Element
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 8751777912..1e5f74f1f5 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -21368,12 +21368,6 @@
       "ikohs"
     ]
   },
-  "Web/API/ScrollToOptions": {
-    "modified": "2020-10-15T22:32:16.096Z",
-    "contributors": [
-      "mfuji09"
-    ]
-  },
   "Web/API/Selection": {
     "modified": "2019-03-23T23:48:10.878Z",
     "contributors": [
@@ -48624,6 +48618,12 @@
       "ethertank"
     ]
   },
+  "conflicting/Web/API/Window/scroll": {
+    "modified": "2020-10-15T22:32:16.096Z",
+    "contributors": [
+      "mfuji09"
+    ]
+  },
   "conflicting/Web/API/XRInputSource/handedness": {
     "modified": "2020-12-06T13:23:10.937Z",
     "contributors": [
diff --git a/files/ja/web/api/scrolltooptions/index.html b/files/ja/conflicting/web/api/window/scroll/index.html
index 52c294a712..72958622fa 100644
--- a/files/ja/web/api/scrolltooptions/index.html
+++ b/files/ja/conflicting/web/api/window/scroll/index.html
@@ -1,6 +1,6 @@
 ---
 title: ScrollToOptions
-slug: Web/API/ScrollToOptions
+slug: conflicting/Web/API/Window/scroll
 tags:
   - API
   - CSSOM View
@@ -9,6 +9,7 @@ tags:
   - ScrollToOptions
   - 辞書
 translation_of: Web/API/ScrollToOptions
+original_slug: Web/API/ScrollToOptions
 ---
 <p>{{APIRef("CSSOM")}}</p>
 
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 24c212fc84..42c3daf701 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1457,6 +1457,7 @@
 /zh-CN/docs/Web/API/Screen.pixelDepth	/zh-CN/docs/Web/API/Screen/pixelDepth
 /zh-CN/docs/Web/API/Screen.width	/zh-CN/docs/Web/API/Screen/width
 /zh-CN/docs/Web/API/Screen_Capture_API/使用屏幕捕获API	/zh-CN/docs/Web/API/Screen_Capture_API/Using_Screen_Capture
+/zh-CN/docs/Web/API/ScrollToOptions	/zh-CN/docs/conflicting/Web/API/Window/scroll
 /zh-CN/docs/Web/API/Selection.addRange	/zh-CN/docs/Web/API/Selection/addRange
 /zh-CN/docs/Web/API/Selection.anchorNode	/zh-CN/docs/Web/API/Selection/anchorNode
 /zh-CN/docs/Web/API/Selection.focusNode	/zh-CN/docs/Web/API/Selection/focusNode
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index f5a9fec677..66a84bde8c 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -19693,12 +19693,6 @@
       "huangxok"
     ]
   },
-  "Web/API/ScrollToOptions": {
-    "modified": "2020-10-15T22:21:27.337Z",
-    "contributors": [
-      "AlexChao"
-    ]
-  },
   "Web/API/Selection": {
     "modified": "2020-10-15T21:21:32.379Z",
     "contributors": [
@@ -47361,6 +47355,12 @@
       "Bayes"
     ]
   },
+  "conflicting/Web/API/Window/scroll": {
+    "modified": "2020-10-15T22:21:27.337Z",
+    "contributors": [
+      "AlexChao"
+    ]
+  },
   "conflicting/Web/API_dd04ca1265cb79b990b8120e5f5070d3": {
     "modified": "2019-03-18T20:42:39.198Z",
     "contributors": [
diff --git a/files/zh-cn/web/api/scrolltooptions/index.html b/files/zh-cn/conflicting/web/api/window/scroll/index.html
index 53593c4232..b564a07814 100644
--- a/files/zh-cn/web/api/scrolltooptions/index.html
+++ b/files/zh-cn/conflicting/web/api/window/scroll/index.html
@@ -1,7 +1,8 @@
 ---
 title: ScrollToOptions
-slug: Web/API/ScrollToOptions
+slug: conflicting/Web/API/Window/scroll
 translation_of: Web/API/ScrollToOptions
+original_slug: Web/API/ScrollToOptions
 ---
 <div>{{ APIRef("CSSOM View") }}</div>