aboutsummaryrefslogtreecommitdiff
path: root/files/zh-cn
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2021-09-21 00:49:44 +0000
committerMDN <actions@users.noreply.github.com>2021-09-21 00:49:44 +0000
commitae378c0aab28bc8ab71168c1ef3e33e4ea3845af (patch)
tree5b320a27c64cf2ae4f4049ee595f7ffb3260f26d /files/zh-cn
parentc7a8e3b8c7654ac1b9a8d88d2b10b9e43db3d071 (diff)
downloadtranslated-content-ae378c0aab28bc8ab71168c1ef3e33e4ea3845af.tar.gz
translated-content-ae378c0aab28bc8ab71168c1ef3e33e4ea3845af.tar.bz2
translated-content-ae378c0aab28bc8ab71168c1ef3e33e4ea3845af.zip
[CRON] sync translated content
Diffstat (limited to 'files/zh-cn')
-rw-r--r--files/zh-cn/_redirects.txt1
-rw-r--r--files/zh-cn/_wikihistory.json12
-rw-r--r--files/zh-cn/conflicting/web/api/window/scroll/index.html (renamed from files/zh-cn/web/api/scrolltooptions/index.html)3
3 files changed, 9 insertions, 7 deletions
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>