aboutsummaryrefslogtreecommitdiff
path: root/files/ja
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2021-09-16 00:51:24 +0000
committerMDN <actions@users.noreply.github.com>2021-09-16 00:51:24 +0000
commit49480fd1cc43cad88bea216b4508ca6f8a19f313 (patch)
tree42dedfeedfeb79d08912b974e6f3fa871b2a44d3 /files/ja
parent5e48f8a9807acb369fa0228d16655fc044f4a17b (diff)
downloadtranslated-content-49480fd1cc43cad88bea216b4508ca6f8a19f313.tar.gz
translated-content-49480fd1cc43cad88bea216b4508ca6f8a19f313.tar.bz2
translated-content-49480fd1cc43cad88bea216b4508ca6f8a19f313.zip
[CRON] sync translated content
Diffstat (limited to 'files/ja')
-rw-r--r--files/ja/_redirects.txt10
-rw-r--r--files/ja/_wikihistory.json36
-rw-r--r--files/ja/conflicting/web/api/blob/size/index.html (renamed from files/ja/web/api/file/filesize/index.html)3
-rw-r--r--files/ja/conflicting/web/api/file/name/index.html (renamed from files/ja/web/api/file/filename/index.html)3
4 files changed, 28 insertions, 24 deletions
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index a242e36d4b..2fd494e351 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -1138,8 +1138,8 @@
/ja/docs/DOM/EventTarget.addEventListener /ja/docs/Web/API/EventTarget/addEventListener
/ja/docs/DOM/EventTarget.dispatchEvent /ja/docs/Web/API/EventTarget/dispatchEvent
/ja/docs/DOM/EventTarget.removeEventListener /ja/docs/Web/API/EventTarget/removeEventListener
-/ja/docs/DOM/File.fileName /ja/docs/Web/API/File/fileName
-/ja/docs/DOM/File.fileSize /ja/docs/Web/API/File/fileSize
+/ja/docs/DOM/File.fileName /ja/docs/conflicting/Web/API/File/name
+/ja/docs/DOM/File.fileSize /ja/docs/conflicting/Web/API/Blob/size
/ja/docs/DOM/File.getAsBinary /ja/docs/Web/API/File/getAsBinary
/ja/docs/DOM/File.getAsText /ja/docs/Web/API/File/getAsText
/ja/docs/DOM/File.lastModifiedDate /ja/docs/Web/API/File/lastModifiedDate
@@ -3087,13 +3087,15 @@
/ja/docs/Web/API/EventTarget.removeEventListener /ja/docs/Web/API/EventTarget/removeEventListener
/ja/docs/Web/API/EventTarget/attachEvent /ja/docs/Web/API/EventTarget/addEventListener
/ja/docs/Web/API/FetchEvent_clone /ja/docs/Web/API/FetchEvent
-/ja/docs/Web/API/File.fileName /ja/docs/Web/API/File/fileName
-/ja/docs/Web/API/File.fileSize /ja/docs/Web/API/File/fileSize
+/ja/docs/Web/API/File.fileName /ja/docs/conflicting/Web/API/File/name
+/ja/docs/Web/API/File.fileSize /ja/docs/conflicting/Web/API/Blob/size
/ja/docs/Web/API/File.getAsBinary /ja/docs/Web/API/File/getAsBinary
/ja/docs/Web/API/File.getAsText /ja/docs/Web/API/File/getAsText
/ja/docs/Web/API/File.name /ja/docs/Web/API/File/name
/ja/docs/Web/API/File.size /ja/docs/Web/API/Blob/size
/ja/docs/Web/API/File.type /ja/docs/Web/API/Blob/type
+/ja/docs/Web/API/File/fileName /ja/docs/conflicting/Web/API/File/name
+/ja/docs/Web/API/File/fileSize /ja/docs/conflicting/Web/API/Blob/size
/ja/docs/Web/API/File/size /ja/docs/Web/API/Blob/size
/ja/docs/Web/API/Geolocation.clearWatch /ja/docs/Web/API/Geolocation/clearWatch
/ja/docs/Web/API/Geolocation.getCurrentPosition /ja/docs/Web/API/Geolocation/getCurrentPosition
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index bc08f24725..de3c610c46 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -14802,24 +14802,6 @@
"souta"
]
},
- "Web/API/File/fileName": {
- "modified": "2020-09-25T16:45:23.436Z",
- "contributors": [
- "silverskyvicto",
- "mfuji09",
- "fscholz",
- "ethertank"
- ]
- },
- "Web/API/File/fileSize": {
- "modified": "2020-09-25T16:46:05.461Z",
- "contributors": [
- "silverskyvicto",
- "mfuji09",
- "fscholz",
- "ethertank"
- ]
- },
"Web/API/File/getAsBinary": {
"modified": "2019-11-18T15:13:21.722Z",
"contributors": [
@@ -48559,6 +48541,24 @@
"silverskyvicto"
]
},
+ "conflicting/Web/API/Blob/size": {
+ "modified": "2020-09-25T16:46:05.461Z",
+ "contributors": [
+ "silverskyvicto",
+ "mfuji09",
+ "fscholz",
+ "ethertank"
+ ]
+ },
+ "conflicting/Web/API/File/name": {
+ "modified": "2020-09-25T16:45:23.436Z",
+ "contributors": [
+ "silverskyvicto",
+ "mfuji09",
+ "fscholz",
+ "ethertank"
+ ]
+ },
"conflicting/Web/API/XRInputSource/handedness": {
"modified": "2020-12-06T13:23:10.937Z",
"contributors": [
diff --git a/files/ja/web/api/file/filesize/index.html b/files/ja/conflicting/web/api/blob/size/index.html
index 21ee3a0562..fc843a8033 100644
--- a/files/ja/web/api/file/filesize/index.html
+++ b/files/ja/conflicting/web/api/blob/size/index.html
@@ -1,6 +1,6 @@
---
title: File.fileSize
-slug: Web/API/File/fileSize
+slug: conflicting/Web/API/Blob/size
tags:
- DOM
- File API
@@ -12,6 +12,7 @@ tags:
- ファイル
- プロパティ
translation_of: Web/API/File/fileSize
+original_slug: Web/API/File/fileSize
---
<p>{{APIRef("File API") }}{{non-standard_header}}{{obsolete_header(7.0)}}</p>
diff --git a/files/ja/web/api/file/filename/index.html b/files/ja/conflicting/web/api/file/name/index.html
index 8096f58d4e..424b4b7685 100644
--- a/files/ja/web/api/file/filename/index.html
+++ b/files/ja/conflicting/web/api/file/name/index.html
@@ -1,6 +1,6 @@
---
title: File.fileName
-slug: Web/API/File/fileName
+slug: conflicting/Web/API/File/name
tags:
- API
- DOM
@@ -11,6 +11,7 @@ tags:
- Property
- Reference
translation_of: Web/API/File/fileName
+original_slug: Web/API/File/fileName
---
<p>{{APIRef("File API")}}{{non-standard_header}}{{obsolete_header(7.0)}}</p>