aboutsummaryrefslogtreecommitdiff
path: root/files/ja
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/ja
parentc7a8e3b8c7654ac1b9a8d88d2b10b9e43db3d071 (diff)
downloadtranslated-content-ae378c0aab28bc8ab71168c1ef3e33e4ea3845af.tar.gz
translated-content-ae378c0aab28bc8ab71168c1ef3e33e4ea3845af.tar.bz2
translated-content-ae378c0aab28bc8ab71168c1ef3e33e4ea3845af.zip
[CRON] sync translated content
Diffstat (limited to 'files/ja')
-rw-r--r--files/ja/_redirects.txt1
-rw-r--r--files/ja/_wikihistory.json12
-rw-r--r--files/ja/conflicting/web/api/window/scroll/index.html (renamed from files/ja/web/api/scrolltooptions/index.html)3
3 files changed, 9 insertions, 7 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>