aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2021-11-27 00:48:15 +0000
committerMDN <actions@users.noreply.github.com>2021-11-27 00:48:15 +0000
commitfb3caec251077c26392d8897c6617031e7d1f5ab (patch)
tree61d0cb1383b90dc36696b52161988dfe862e99f5
parentb83337c7cf726c88a5909433b1a996f6b571ae75 (diff)
downloadtranslated-content-fb3caec251077c26392d8897c6617031e7d1f5ab.tar.gz
translated-content-fb3caec251077c26392d8897c6617031e7d1f5ab.tar.bz2
translated-content-fb3caec251077c26392d8897c6617031e7d1f5ab.zip
[CRON] sync translated content
-rw-r--r--files/fr/_redirects.txt3
-rw-r--r--files/fr/_wikihistory.json12
-rw-r--r--files/fr/conflicting/web/css/css_scroll_snap/index.md (renamed from files/fr/web/css/css_scroll_snap/browser_compat/index.md)4
-rw-r--r--files/ja/_redirects.txt1
-rw-r--r--files/ja/_wikihistory.json14
-rw-r--r--files/ja/conflicting/web/css/css_scroll_snap/index.md (renamed from files/ja/web/css/css_scroll_snap/browser_compat/index.md)3
6 files changed, 20 insertions, 17 deletions
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index e770de7f73..a38e761993 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -4014,7 +4014,8 @@
/fr/docs/Web/CSS/CSS_Logical_Properties/Propriétés_logiques_flottements_positionnement /fr/docs/Web/CSS/CSS_Logical_Properties/Floating_and_positioning
/fr/docs/Web/CSS/CSS_Logical_Properties/Propriétés_logiques_marges_bordures_remplissages /fr/docs/Web/CSS/CSS_Logical_Properties/Margins_borders_padding
/fr/docs/Web/CSS/CSS_Masks /fr/docs/Web/CSS/CSS_Masking
-/fr/docs/Web/CSS/CSS_Scroll_Snap/Compatibilité_navigateurs /fr/docs/Web/CSS/CSS_Scroll_Snap/Browser_compat
+/fr/docs/Web/CSS/CSS_Scroll_Snap/Browser_compat /fr/docs/conflicting/Web/CSS/CSS_Scroll_Snap
+/fr/docs/Web/CSS/CSS_Scroll_Snap/Compatibilité_navigateurs /fr/docs/conflicting/Web/CSS/CSS_Scroll_Snap
/fr/docs/Web/CSS/CSS_Scroll_Snap/Concepts_de_base /fr/docs/Web/CSS/CSS_Scroll_Snap/Basic_concepts
/fr/docs/Web/CSS/CSS_Selectors/Utiliser_la_pseudo-classe_:target_dans_un_selecteur /fr/docs/Web/CSS/CSS_Selectors/Using_the_:target_pseudo-class_in_selectors
/fr/docs/Web/CSS/CSS_Shapes/Aperçu_formes_CSS /fr/docs/Web/CSS/CSS_Shapes/Overview_of_CSS_Shapes
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index f13989f5f4..ddff6a86f4 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -25048,12 +25048,6 @@
"SphinxKnight"
]
},
- "Web/CSS/CSS_Scroll_Snap/Browser_compat": {
- "modified": "2019-07-21T13:28:24.043Z",
- "contributors": [
- "SphinxKnight"
- ]
- },
"Web/CSS/CSS_Scroll_Snap_Points": {
"modified": "2019-04-26T04:18:54.788Z",
"contributors": [
@@ -43312,6 +43306,12 @@
"SphinxKnight"
]
},
+ "conflicting/Web/CSS/CSS_Scroll_Snap": {
+ "modified": "2019-07-21T13:28:24.043Z",
+ "contributors": [
+ "SphinxKnight"
+ ]
+ },
"conflicting/Web/CSS/Filter_Effects": {
"modified": "2019-03-23T22:35:55.917Z",
"contributors": [
diff --git a/files/fr/web/css/css_scroll_snap/browser_compat/index.md b/files/fr/conflicting/web/css/css_scroll_snap/index.md
index c68c8d9693..e2f74c3d97 100644
--- a/files/fr/web/css/css_scroll_snap/browser_compat/index.md
+++ b/files/fr/conflicting/web/css/css_scroll_snap/index.md
@@ -1,13 +1,13 @@
---
title: Compatibilité des navigateurs et CSS Scroll Snap
-slug: Web/CSS/CSS_Scroll_Snap/Browser_compat
+slug: conflicting/Web/CSS/CSS_Scroll_Snap
tags:
- CSS
- CSS Scroll Snap
- Compatibilité
- Guide
translation_of: Web/CSS/CSS_Scroll_Snap/Browser_compat
-original_slug: Web/CSS/CSS_Scroll_Snap/Compatibilité_navigateurs
+original_slug: Web/CSS/CSS_Scroll_Snap/Browser_compat
---
{{CSSRef}}
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 029fae7726..22601ab223 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3656,6 +3656,7 @@
/ja/docs/Web/CSS/CSS_Masks /ja/docs/Web/CSS/CSS_Masking
/ja/docs/Web/CSS/CSS_Reference /ja/docs/Web/CSS/Reference
/ja/docs/Web/CSS/CSS_Reference/Mozilla_Extensions /ja/docs/Web/CSS/Mozilla_Extensions
+/ja/docs/Web/CSS/CSS_Scroll_Snap/Browser_compat /ja/docs/conflicting/Web/CSS/CSS_Scroll_Snap
/ja/docs/Web/CSS/CSS_Selectors/Comparison_with_XPath /ja/docs/Web/XPath/Comparison_with_CSS_selectors
/ja/docs/Web/CSS/CSS_Shapes/Shapes_From_Box_Values /ja/docs/Web/CSS/CSS_Shapes/From_box_values
/ja/docs/Web/CSS/CSS_User_Interface /ja/docs/Web/CSS/CSS_Basic_User_Interface
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index ad7fa7a410..3b3ca3532e 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -28684,13 +28684,6 @@
"mfuji09"
]
},
- "Web/CSS/CSS_Scroll_Snap/Browser_compat": {
- "modified": "2020-02-21T23:37:52.316Z",
- "contributors": [
- "yuheiy",
- "mfuji09"
- ]
- },
"Web/CSS/CSS_Scroll_Snap_Points": {
"modified": "2020-10-15T21:58:12.862Z",
"contributors": [
@@ -48605,6 +48598,13 @@
"Wind1808"
]
},
+ "conflicting/Web/CSS/CSS_Scroll_Snap": {
+ "modified": "2020-02-21T23:37:52.316Z",
+ "contributors": [
+ "yuheiy",
+ "mfuji09"
+ ]
+ },
"conflicting/Web/CSS/Media_Queries/Using_media_queries": {
"modified": "2020-05-24T03:45:53.652Z",
"contributors": [
diff --git a/files/ja/web/css/css_scroll_snap/browser_compat/index.md b/files/ja/conflicting/web/css/css_scroll_snap/index.md
index f34236fb01..3a477e0dbb 100644
--- a/files/ja/web/css/css_scroll_snap/browser_compat/index.md
+++ b/files/ja/conflicting/web/css/css_scroll_snap/index.md
@@ -1,6 +1,6 @@
---
title: ブラウザーの互換性とスクロールスナップ
-slug: Web/CSS/CSS_Scroll_Snap/Browser_compat
+slug: conflicting/Web/CSS/CSS_Scroll_Snap
tags:
- CSS
- CSS スクロールスナップ
@@ -11,6 +11,7 @@ tags:
- browser compat
- compat
translation_of: Web/CSS/CSS_Scroll_Snap/Browser_compat
+original_slug: Web/CSS/CSS_Scroll_Snap/Browser_compat
---
{{CSSRef}}