From ccf72dc2e8ad61710a1252432ed758ca506ba043 Mon Sep 17 00:00:00 2001 From: mdn-bot <108879845+mdn-bot@users.noreply.github.com> Date: Thu, 22 Jun 2023 00:16:41 +0000 Subject: [PATCH 1/4] ja: sync translated content --- files/ja/_redirects.txt | 1 + files/ja/_wikihistory.json | 8 ++++---- .../web/css/css_paged_media}/index.md | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) rename files/ja/{web/css/paged_media => conflicting/web/css/css_paged_media}/index.md (89%) diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt index 1e3677d52744ca..960963c5c3bd2d 100644 --- a/files/ja/_redirects.txt +++ b/files/ja/_redirects.txt @@ -3631,6 +3631,7 @@ /ja/docs/Web/CSS/Media_Queries/Using_media_queries /ja/docs/Web/CSS/CSS_media_queries/Using_media_queries /ja/docs/Web/CSS/Motion_Path /ja/docs/Web/CSS/CSS_motion_path /ja/docs/Web/CSS/Other_Resources /ja/docs/Web/CSS +/ja/docs/Web/CSS/Paged_Media /ja/docs/conflicting/Web/CSS/CSS_paged_media /ja/docs/Web/CSS/Reference/@viewport /ja/docs/Web/CSS /ja/docs/Web/CSS/Reference/@viewport/max-zoom /ja/docs/Web/CSS /ja/docs/Web/CSS/Reference/@viewport/min-zoom /ja/docs/Web/CSS diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json index 87322024357699..2ae46d45f26a22 100644 --- a/files/ja/_wikihistory.json +++ b/files/ja/_wikihistory.json @@ -17136,10 +17136,6 @@ "Piro" ] }, - "Web/CSS/Paged_Media": { - "modified": "2019-03-18T21:35:37.752Z", - "contributors": ["mfuji09"] - }, "Web/CSS/Privacy_and_the_:visited_selector": { "modified": "2020-12-01T21:03:57.973Z", "contributors": ["mfuji09", "SphinxKnight", "ethertank", "sosleepy"] @@ -30722,6 +30718,10 @@ "modified": "2019-03-23T23:28:35.294Z", "contributors": ["yyss", "teoli"] }, + "conflicting/Web/CSS/CSS_paged_media": { + "modified": "2019-03-18T21:35:37.752Z", + "contributors": ["mfuji09"] + }, "conflicting/Web/CSS/Reference": { "modified": "2019-03-18T21:33:15.134Z", "contributors": ["mfuji09"] diff --git a/files/ja/web/css/paged_media/index.md b/files/ja/conflicting/web/css/css_paged_media/index.md similarity index 89% rename from files/ja/web/css/paged_media/index.md rename to files/ja/conflicting/web/css/css_paged_media/index.md index 00279195a73d3b..1166d2927fde82 100644 --- a/files/ja/web/css/paged_media/index.md +++ b/files/ja/conflicting/web/css/css_paged_media/index.md @@ -1,6 +1,7 @@ --- title: ページ化メディア -slug: Web/CSS/Paged_Media +slug: conflicting/Web/CSS/CSS_paged_media +original_slug: Web/CSS/Paged_Media --- {{CSSRef}} From bfa9d4a44b13ca1101538a4f436f61de981680dc Mon Sep 17 00:00:00 2001 From: Masahiro FUJIMOTO Date: Fri, 23 Jun 2023 00:04:43 +0900 Subject: [PATCH 2/4] Update _redirects.txt --- files/ja/_redirects.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt index 960963c5c3bd2d..0b0b669ad72006 100644 --- a/files/ja/_redirects.txt +++ b/files/ja/_redirects.txt @@ -3631,7 +3631,7 @@ /ja/docs/Web/CSS/Media_Queries/Using_media_queries /ja/docs/Web/CSS/CSS_media_queries/Using_media_queries /ja/docs/Web/CSS/Motion_Path /ja/docs/Web/CSS/CSS_motion_path /ja/docs/Web/CSS/Other_Resources /ja/docs/Web/CSS -/ja/docs/Web/CSS/Paged_Media /ja/docs/conflicting/Web/CSS/CSS_paged_media +/ja/docs/Web/CSS/Paged_Media /ja/docs/Web/CSS/CSS_paged_media /ja/docs/Web/CSS/Reference/@viewport /ja/docs/Web/CSS /ja/docs/Web/CSS/Reference/@viewport/max-zoom /ja/docs/Web/CSS /ja/docs/Web/CSS/Reference/@viewport/min-zoom /ja/docs/Web/CSS From 6d0d694618698da07c81ba8b8d4d262aa5ee5d5b Mon Sep 17 00:00:00 2001 From: Masahiro FUJIMOTO Date: Fri, 23 Jun 2023 00:05:37 +0900 Subject: [PATCH 3/4] Update _wikihistory.json --- files/ja/_wikihistory.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json index 2ae46d45f26a22..1af439e0e9785d 100644 --- a/files/ja/_wikihistory.json +++ b/files/ja/_wikihistory.json @@ -30718,10 +30718,6 @@ "modified": "2019-03-23T23:28:35.294Z", "contributors": ["yyss", "teoli"] }, - "conflicting/Web/CSS/CSS_paged_media": { - "modified": "2019-03-18T21:35:37.752Z", - "contributors": ["mfuji09"] - }, "conflicting/Web/CSS/Reference": { "modified": "2019-03-18T21:33:15.134Z", "contributors": ["mfuji09"] From 1acba3c6a0036f34a09e8a200f10121327bc2c8c Mon Sep 17 00:00:00 2001 From: Masahiro FUJIMOTO Date: Fri, 23 Jun 2023 00:05:51 +0900 Subject: [PATCH 4/4] Delete index.md --- .../conflicting/web/css/css_paged_media/index.md | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 files/ja/conflicting/web/css/css_paged_media/index.md diff --git a/files/ja/conflicting/web/css/css_paged_media/index.md b/files/ja/conflicting/web/css/css_paged_media/index.md deleted file mode 100644 index 1166d2927fde82..00000000000000 --- a/files/ja/conflicting/web/css/css_paged_media/index.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: ページ化メディア -slug: conflicting/Web/CSS/CSS_paged_media -original_slug: Web/CSS/Paged_Media ---- - -{{CSSRef}} - -**ページ化メディア**のプロパティは、印刷物などの分離したページでコンテンツが分割されるメディアのコンテンツの表現を制御します。ページ区切り、印刷可能領域の制御、左と右のページの違い、要素内の改ページの制御などを設定することができます。広く対応されているプロパティは以下の通りです。 - -- {{ cssxref("page-break-before") }} -- {{ cssxref("page-break-after") }} -- {{ cssxref("page-break-inside") }} -- {{ cssxref("orphans") }} -- {{ cssxref("widows") }} -- {{ cssxref("@page") }}