aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2022-01-14 00:56:18 +0000
committerMDN <actions@users.noreply.github.com>2022-01-14 00:56:18 +0000
commitbf0b742faea598cd0163e2c2e02c7b406e6da75f (patch)
treecc95e513d6870cec298ce83c992d22c3d902608c
parent122d4c5f14b14b0285a6a8121231d60a4c6a0de8 (diff)
downloadtranslated-content-bf0b742faea598cd0163e2c2e02c7b406e6da75f.tar.gz
translated-content-bf0b742faea598cd0163e2c2e02c7b406e6da75f.tar.bz2
translated-content-bf0b742faea598cd0163e2c2e02c7b406e6da75f.zip
[CRON] sync translated content
-rw-r--r--files/fr/_redirects.txt3
-rw-r--r--files/fr/_wikihistory.json14
-rw-r--r--files/fr/conflicting/web/css/reference/index.md (renamed from files/fr/web/css/list_of_proprietary_css_features/index.md)4
-rw-r--r--files/ja/_redirects.txt1
-rw-r--r--files/ja/_wikihistory.json12
-rw-r--r--files/ja/conflicting/web/css/reference/index.html (renamed from files/ja/web/css/list_of_proprietary_css_features/index.html)3
6 files changed, 20 insertions, 17 deletions
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index a6acf744c7..378d7d0b92 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -4109,7 +4109,8 @@
/fr/docs/Web/CSS/Layout_cookbook/Navigation_Breadcrumb /fr/docs/Web/CSS/Layout_cookbook/Breadcrumb_Navigation
/fr/docs/Web/CSS/Layout_cookbook/Navigation_segmentée /fr/docs/Web/CSS/Layout_cookbook/Split_Navigation
/fr/docs/Web/CSS/Les_variables_CSS /fr/docs/Web/CSS/Using_CSS_custom_properties
-/fr/docs/Web/CSS/Liste_de_Fonctionnalités_CSS_Propriétaires /fr/docs/Web/CSS/List_of_Proprietary_CSS_Features
+/fr/docs/Web/CSS/List_of_Proprietary_CSS_Features /fr/docs/conflicting/Web/CSS/Reference
+/fr/docs/Web/CSS/Liste_de_Fonctionnalités_CSS_Propriétaires /fr/docs/conflicting/Web/CSS/Reference
/fr/docs/Web/CSS/Liste_propriétés_CSS_animées /fr/docs/Web/CSS/CSS_animated_properties
/fr/docs/Web/CSS/Mode_de_mise_en_page /fr/docs/Web/CSS/Layout_mode
/fr/docs/Web/CSS/Modèle_de_boîte /en-US/docs/Learn/CSS/Building_blocks/The_box_model
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index c154f0de58..e3685c3a97 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -25396,13 +25396,6 @@
"FredB"
]
},
- "Web/CSS/List_of_Proprietary_CSS_Features": {
- "modified": "2019-04-06T13:18:27.677Z",
- "contributors": [
- "SphinxKnight",
- "xdelatour"
- ]
- },
"Web/CSS/Media_Queries": {
"modified": "2019-06-03T14:19:49.928Z",
"contributors": [
@@ -43333,6 +43326,13 @@
"Kyodev"
]
},
+ "conflicting/Web/CSS/Reference": {
+ "modified": "2019-04-06T13:18:27.677Z",
+ "contributors": [
+ "SphinxKnight",
+ "xdelatour"
+ ]
+ },
"conflicting/Web/CSS/border-collapse": {
"modified": "2019-03-23T23:49:00.263Z",
"contributors": [
diff --git a/files/fr/web/css/list_of_proprietary_css_features/index.md b/files/fr/conflicting/web/css/reference/index.md
index 0f9bdc4761..d91a2e25f4 100644
--- a/files/fr/web/css/list_of_proprietary_css_features/index.md
+++ b/files/fr/conflicting/web/css/reference/index.md
@@ -1,12 +1,12 @@
---
title: Liste de fonctionnalités CSS propriétaires
-slug: Web/CSS/List_of_Proprietary_CSS_Features
+slug: conflicting/Web/CSS/Reference
tags:
- CSS
- Draft
- NeedsContent
translation_of: Web/CSS/List_of_Proprietary_CSS_Features
-original_slug: Web/CSS/Liste_de_Fonctionnalités_CSS_Propriétaires
+original_slug: Web/CSS/List_of_Proprietary_CSS_Features
---
{{CSSRef}}{{Draft}}
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index fba19d6a4e..e2374896d4 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3689,6 +3689,7 @@
/ja/docs/Web/CSS/Getting_started/Tables /ja/docs/Learn/CSS/Building_blocks/Styling_tables
/ja/docs/Web/CSS/Getting_started/Text_styles /ja/docs/Learn/CSS/Styling_text/Fundamentals
/ja/docs/Web/CSS/Getting_started/What_is_CSS /ja/docs/Learn/CSS/First_steps/How_CSS_works
+/ja/docs/Web/CSS/List_of_Proprietary_CSS_Features /ja/docs/conflicting/Web/CSS/Reference
/ja/docs/Web/CSS/Media /ja/docs/Web/CSS/@media
/ja/docs/Web/CSS/Media/Visual /ja/docs/Web/CSS/@media
/ja/docs/Web/CSS/Motion_Path /ja/docs/Web/CSS/CSS_Motion_Path
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 99f27c2054..13890f904e 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -28989,12 +28989,6 @@
"haccy"
]
},
- "Web/CSS/List_of_Proprietary_CSS_Features": {
- "modified": "2019-03-18T21:33:15.134Z",
- "contributors": [
- "mfuji09"
- ]
- },
"Web/CSS/Media_Queries/Testing_media_queries": {
"modified": "2020-10-15T21:07:28.863Z",
"contributors": [
@@ -48609,6 +48603,12 @@
"sosleepy"
]
},
+ "conflicting/Web/CSS/Reference": {
+ "modified": "2019-03-18T21:33:15.134Z",
+ "contributors": [
+ "mfuji09"
+ ]
+ },
"conflicting/Web/CSS/cursor": {
"modified": "2020-12-06T14:47:19.654Z",
"contributors": [
diff --git a/files/ja/web/css/list_of_proprietary_css_features/index.html b/files/ja/conflicting/web/css/reference/index.html
index c2635b76ec..f6c01d7f26 100644
--- a/files/ja/web/css/list_of_proprietary_css_features/index.html
+++ b/files/ja/conflicting/web/css/reference/index.html
@@ -1,10 +1,11 @@
---
title: プロプライエタリな CSS 機能の一覧
-slug: Web/CSS/List_of_Proprietary_CSS_Features
+slug: conflicting/Web/CSS/Reference
tags:
- CSS
- Junk
translation_of: Web/CSS/List_of_Proprietary_CSS_Features
+original_slug: Web/CSS/List_of_Proprietary_CSS_Features
---
<div>{{ CSSRef() }}</div>