[ja] sync translated content (#16711)

* ja: sync translated content * 英語版での変更を反映 * ja: sync translated content * 不要なファイルを削除 * ja: sync translated content * 不要なファイルを削除 * ja: sync translated content * ja: sync translated content * ja: sync translated content * ja: sync translated content * Revert "Merge branch 'content-sync-ja' of https://github.com/mdn/translated-content into content-sync-ja" This reverts commit dc2da88, reversing changes made to e9cbbca. Revert "Revert "Merge branch 'content-sync-ja' of https://github.com/mdn/translated-content into content-sync-ja"" This reverts commit 0f338d7. * Update index.md --------- Co-authored-by: Masahiro FUJIMOTO <[email protected]>
mdn · Oct 29, 2023 · f916a38 · f916a38
1 parent 0d99d65
commit f916a38
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
@@ -1339,7 +1339,9 @@
 /ja/docs/Glossary/Global_attribute	/ja/docs/Web/HTML/Global_attributes
 /ja/docs/Glossary/Grid_Rows	/ja/docs/Glossary/Grid_Row
 /ja/docs/Glossary/Header	/ja/docs/Glossary/HTTP_header
+/ja/docs/Glossary/I18N	/ja/docs/Glossary/Internationalization
 /ja/docs/Glossary/Index	/ja/docs/Glossary
+/ja/docs/Glossary/Internationalization_and_localization	/ja/docs/conflicting/Glossary/Internationalization
 /ja/docs/Glossary/POP3	/ja/docs/Glossary/POP
 /ja/docs/Glossary/Reference	/ja/docs/Glossary/Object_reference
 /ja/docs/Glossary/Round_Trip_Time_(RTT)	/ja/docs/Glossary/Round_Trip_Time
@@ -2759,6 +2761,7 @@
 /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/size	/ja/docs/Web/API/Blob/size
+/ja/docs/Web/API/File/type	/ja/docs/conflicting/Web/API/Blob/type
 /ja/docs/Web/API/FileReader/onabort	/ja/docs/Web/API/FileReader/abort_event
 /ja/docs/Web/API/FileReader/onerror	/ja/docs/Web/API/FileReader/error_event
 /ja/docs/Web/API/FileReader/onload	/ja/docs/Web/API/FileReader/load_event

diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
@@ -992,10 +992,6 @@
     "modified": "2019-03-18T21:42:25.531Z",
     "contributors": ["Uemmra3", "takeru0430"]
   },
-  "Glossary/I18N": {
-    "modified": "2019-03-18T21:35:48.856Z",
-    "contributors": ["hamasaki", "kadokura"]
-  },
   "Glossary/IANA": {
     "modified": "2019-03-18T21:15:23.095Z",
     "contributors": ["Wind1808"]
@@ -1084,9 +1080,9 @@
     "modified": "2019-03-23T22:38:23.483Z",
     "contributors": ["Potappo", "lv7777", "w-volte"]
   },
-  "Glossary/Internationalization_and_localization": {
-    "modified": "2020-05-24T08:29:22.994Z",
-    "contributors": ["dskmori", "Potappo", "dukesan"]
+  "Glossary/Internationalization": {
+    "modified": "2019-03-18T21:35:48.856Z",
+    "contributors": ["hamasaki", "kadokura"]
   },
   "Glossary/Internet": {
     "modified": "2019-03-23T22:38:33.920Z",
@@ -8546,10 +8542,6 @@
     "modified": "2020-10-15T21:21:38.016Z",
     "contributors": ["mfuji09", "silverskyvicto", "fscholz", "ethertank"]
   },
-  "Web/API/File/type": {
-    "modified": "2020-10-15T22:11:44.472Z",
-    "contributors": ["silverskyvicto", "mfuji09"]
-  },
   "Web/API/File/webkitRelativePath": {
     "modified": "2020-10-15T22:11:44.308Z",
     "contributors": ["silverskyvicto"]
@@ -30218,6 +30210,10 @@
     "modified": "2020-07-17T23:22:13.809Z",
     "contributors": ["papparapa", "silverskyvicto"]
   },
+  "conflicting/Glossary/Internationalization": {
+    "modified": "2020-05-24T08:29:22.994Z",
+    "contributors": ["dskmori", "Potappo", "dukesan"]
+  },
   "conflicting/Glossary/Scroll_container": {
     "modified": "2019-03-18T20:53:07.981Z",
     "contributors": ["mfuji09"]
@@ -30346,6 +30342,10 @@
     "modified": "2020-09-30T15:30:24.568Z",
     "contributors": ["chrisdavidmills", "dvincent"]
   },
+  "conflicting/Web/API/Blob/type": {
+    "modified": "2020-10-15T22:11:44.472Z",
+    "contributors": ["silverskyvicto", "mfuji09"]
+  },
   "conflicting/Web/API/Document": {
     "modified": "2020-10-15T22:12:31.952Z",
     "contributors": ["mfuji09"]

diff --git a/...nationalization_and_localization/index.md → ...ng/glossary/internationalization/index.md b/...nationalization_and_localization/index.md → ...ng/glossary/internationalization/index.md
@@ -1,8 +1,7 @@
 ---
 title: Internationalization (国際化)
-slug: Glossary/Internationalization_and_localization
-l10n:
-  sourceCommit: 4a43f2f9af30db0721b0150909615f5fe9b041a4
+slug: conflicting/Glossary/Internationalization
+original_slug: Glossary/Internationalization_and_localization
 ---
 
 **国際化** (しばしば 「[i18n](/ja/docs/Glossary/I18N)」と略される) は、ウェブサイトやウェブアプリケーションを、異なる言語、地域的差異、異なる国や地域による技術的要求に対応させます。 国際化はあなたのウェブアプリケーションを構築するプロセスであり、新しい言語や地域をサポートする場合に、さほど多くの技術的努力を必要とせずに幅広い言語や地域に対応化可能です。また、すべてのコンテンツをレイアウトを壊すことなくアプリケーションを翻訳あるいはローカライズするので、ユーザーは機能を閲覧することができます。

diff --git a/files/ja/web/api/file/type/index.md → ...ja/conflicting/web/api/blob/type/index.md b/files/ja/web/api/file/type/index.md → ...ja/conflicting/web/api/blob/type/index.md
@@ -1,9 +1,7 @@
 ---
 title: "File: type プロパティ"
-short-title: type
-slug: Web/API/File/type
-l10n:
-  sourceCommit: 339595951b78774e951b1a9d215a6db6b856f6b2
+slug: conflicting/Web/API/Blob/type
+original_slug: Web/API/File/type
 ---
 
 {{APIRef("File API")}}

diff --git a/files/ja/glossary/i18n/index.md → ...ja/glossary/internationalization/index.md b/files/ja/glossary/i18n/index.md → ...ja/glossary/internationalization/index.md
@@ -1,6 +1,7 @@
 ---
 title: I18N(国際化対応)
-slug: Glossary/I18N
+slug: Glossary/Internationalization
+original_slug: Glossary/I18N
 ---
 
 i18n("internationalization"という 20 文字の単語より)(国際化対応)は、製品やサービスをどんなターゲット文化にも容易に適応させるベストプラクティスです。