aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2022-03-16 00:12:44 +0000
committerMDN <actions@users.noreply.github.com>2022-03-16 00:12:44 +0000
commit2a0848dfc98c2f04fe5c72a627e2b3be281fc3df (patch)
tree8a22612627a2642445d86e7742b52f3cdd833600
parent310f9d126ee841807f15a8620da5a9de6a9da4ec (diff)
downloadtranslated-content-2a0848dfc98c2f04fe5c72a627e2b3be281fc3df.tar.gz
translated-content-2a0848dfc98c2f04fe5c72a627e2b3be281fc3df.tar.bz2
translated-content-2a0848dfc98c2f04fe5c72a627e2b3be281fc3df.zip
[CRON] sync translated content
-rw-r--r--files/fr/_redirects.txt1
-rw-r--r--files/fr/_wikihistory.json2
-rw-r--r--files/fr/web/api/sharedworkerglobalscope/connect_event/index.md (renamed from files/fr/web/api/sharedworkerglobalscope/onconnect/index.md)3
-rw-r--r--files/ja/_redirects.txt10
-rw-r--r--files/ja/_wikihistory.json76
-rw-r--r--files/ja/conflicting/learn_5c079fa29d8d329cb43586076f0bb7bf/index.html (renamed from files/ja/learn/release_notes/index.html)3
-rw-r--r--files/ja/conflicting/web/api/mediarecorder/error_event/index.html (renamed from files/ja/web/api/mediarecorder/onerror/index.html)3
-rw-r--r--files/ja/web/api/mediarecorder/dataavailable_event/index.html (renamed from files/ja/web/api/mediarecorder/ondataavailable/index.html)3
-rw-r--r--files/ja/web/api/mediarecorder/pause_event/index.html (renamed from files/ja/web/api/mediarecorder/onpause/index.html)3
-rw-r--r--files/ja/web/api/mediarecorder/resume_event/index.html (renamed from files/ja/web/api/mediarecorder/onresume/index.html)3
-rw-r--r--files/ja/web/api/mediarecorder/start_event/index.html (renamed from files/ja/web/api/mediarecorder/onstart/index.html)3
-rw-r--r--files/ja/web/api/mediarecorder/stop_event/index.html (renamed from files/ja/web/api/mediarecorder/onstop/index.html)3
-rw-r--r--files/ja/web/api/worker/error_event/index.html (renamed from files/ja/web/api/worker/onerror/index.html)5
-rw-r--r--files/pt-br/_redirects.txt3
-rw-r--r--files/pt-br/_wikihistory.json12
-rw-r--r--files/pt-br/conflicting/learn/index.html (renamed from files/pt-br/learn/release_notes/index.html)4
-rw-r--r--files/ru/_redirects.txt1
-rw-r--r--files/ru/_wikihistory.json2
-rw-r--r--files/ru/web/api/mediarecorder/dataavailable_event/index.html (renamed from files/ru/web/api/mediarecorder/ondataavailable/index.html)3
-rw-r--r--files/zh-cn/_redirects.txt1
-rw-r--r--files/zh-cn/_wikihistory.json14
-rw-r--r--files/zh-cn/web/api/mediarecorder/dataavailable_event/index.html (renamed from files/zh-cn/web/api/mediarecorder/ondataavailable/index.html)3
22 files changed, 92 insertions, 69 deletions
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index f18598385c..a5dcbf8334 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -3743,6 +3743,7 @@
/fr/docs/Web/API/Selection.toString /fr/docs/Web/API/Selection/toString
/fr/docs/Web/API/Selection_API /fr/docs/conflicting/Web/API/Selection
/fr/docs/Web/API/ServiceWorkerState /fr/docs/orphaned/Web/API/ServiceWorkerState
+/fr/docs/Web/API/SharedWorkerGlobalScope/onconnect /fr/docs/Web/API/SharedWorkerGlobalScope/connect_event
/fr/docs/Web/API/Storage/LocalStorage /fr/docs/conflicting/Web/API/Window/localStorage
/fr/docs/Web/API/StorageEstimate /fr/docs/conflicting/Web/API/StorageManager/estimate
/fr/docs/Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent /fr/docs/conflicting/Web/API/Pointer_events
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index db7fabbb59..4eb949802b 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -19238,7 +19238,7 @@
"Arzak656"
]
},
- "Web/API/SharedWorkerGlobalScope/onconnect": {
+ "Web/API/SharedWorkerGlobalScope/connect_event": {
"modified": "2020-10-15T22:26:31.419Z",
"contributors": [
"Arzak656"
diff --git a/files/fr/web/api/sharedworkerglobalscope/onconnect/index.md b/files/fr/web/api/sharedworkerglobalscope/connect_event/index.md
index f14a8d0b4b..6f3f17e881 100644
--- a/files/fr/web/api/sharedworkerglobalscope/onconnect/index.md
+++ b/files/fr/web/api/sharedworkerglobalscope/connect_event/index.md
@@ -1,7 +1,8 @@
---
title: SharedWorkerGlobalScope.onconnect
-slug: Web/API/SharedWorkerGlobalScope/onconnect
+slug: Web/API/SharedWorkerGlobalScope/connect_event
translation_of: Web/API/SharedWorkerGlobalScope/onconnect
+original_slug: Web/API/SharedWorkerGlobalScope/onconnect
---
{{APIRef("Web Workers API")}}
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index f5b26185a7..249a98cdc6 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -2702,6 +2702,7 @@
/ja/docs/Learn/JavaScript/Objects/継承 /ja/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
/ja/docs/Learn/JavaScript/非同期 /ja/docs/Learn/JavaScript/Asynchronous
/ja/docs/Learn/Performance/Populating_the_page:_how_browsers_work /ja/docs/Web/Performance/How_browsers_work
+/ja/docs/Learn/Release_notes /ja/docs/conflicting/Learn_5c079fa29d8d329cb43586076f0bb7bf
/ja/docs/Learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry /ja/docs/orphaned/Learn/Server-side/Express_Nodejs/Installing_on_PWS_Cloud_Foundry
/ja/docs/Link_prefetching_FAQ /ja/docs/Web/HTTP/Link_prefetching_FAQ
/ja/docs/Localization /ja/docs/Glossary/Localization
@@ -3020,7 +3021,7 @@
/ja/docs/Web-e/Guide/CSS/Understanding_z_index/Stacking_without_z-index /ja/docs/Web/CSS/CSS_Positioning/Understanding_z_index/Stacking_without_z-index
/ja/docs/Web-e/Guide/CSS/Understanding_z_index/The_stacking_context /ja/docs/Web/CSS/CSS_Positioning/Understanding_z_index/The_stacking_context
/ja/docs/Web/API/AbstractWorker /ja/docs/Web/API/Worker
-/ja/docs/Web/API/AbstractWorker/onerror /ja/docs/Web/API/Worker/onerror
+/ja/docs/Web/API/AbstractWorker/onerror /ja/docs/Web/API/Worker/error_event
/ja/docs/Web/API/Apps.mgmt.addEventListener /ja/docs/Web/API/EventTarget/addEventListener
/ja/docs/Web/API/Apps.mgmt.removeEventListener /ja/docs/Web/API/EventTarget/removeEventListener
/ja/docs/Web/API/AudioBufferSourceNode.onended /ja/docs/Web/API/AudioScheduledSourceNode/ended_event
@@ -3189,6 +3190,12 @@
/ja/docs/Web/API/MediaCapabilitiesInfo /ja/docs/Web/API/MediaCapabilities/encodingInfo
/ja/docs/Web/API/MediaDevices/ondevicechange /ja/docs/Web/API/MediaDevices/devicechange_event
/ja/docs/Web/API/MediaQueryList/onchange /ja/docs/Web/API/MediaQueryList/change_event
+/ja/docs/Web/API/MediaRecorder/ondataavailable /ja/docs/Web/API/MediaRecorder/dataavailable_event
+/ja/docs/Web/API/MediaRecorder/onerror /ja/docs/conflicting/Web/API/MediaRecorder/error_event
+/ja/docs/Web/API/MediaRecorder/onpause /ja/docs/Web/API/MediaRecorder/pause_event
+/ja/docs/Web/API/MediaRecorder/onresume /ja/docs/Web/API/MediaRecorder/resume_event
+/ja/docs/Web/API/MediaRecorder/onstart /ja/docs/Web/API/MediaRecorder/start_event
+/ja/docs/Web/API/MediaRecorder/onstop /ja/docs/Web/API/MediaRecorder/stop_event
/ja/docs/Web/API/MediaRecorder_API /ja/docs/Web/API/MediaStream_Recording_API
/ja/docs/Web/API/MediaStream/onaddtrack /ja/docs/Web/API/MediaStream/addtrack_event
/ja/docs/Web/API/MediaStreamConstraints /ja/docs/conflicting/Web/API/MediaDevices/getUserMedia
@@ -3394,6 +3401,7 @@
/ja/docs/Web/API/WindowTimers/clearTimeout /ja/docs/Web/API/clearTimeout
/ja/docs/Web/API/WindowTimers/setInterval /ja/docs/Web/API/setInterval
/ja/docs/Web/API/WindowTimers/setTimeout /ja/docs/Web/API/setTimeout
+/ja/docs/Web/API/Worker/onerror /ja/docs/Web/API/Worker/error_event
/ja/docs/Web/API/WorkerGlobalScope/caches /ja/docs/Web/API/caches
/ja/docs/Web/API/XMLHttpRequest/onreadystatechange /ja/docs/Web/API/XMLHttpRequest/readystatechange_event
/ja/docs/Web/API/XMLHttpRequest/openRequest /ja/docs/orphaned/Web/API/XMLHttpRequest/openRequest
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index 2829a4ea1d..8898196d62 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -5609,12 +5609,6 @@
"silverskyvicto"
]
},
- "Learn/Release_notes": {
- "modified": "2020-09-28T09:40:44.944Z",
- "contributors": [
- "silverskyvicto"
- ]
- },
"Learn/Server-side": {
"modified": "2020-07-16T22:35:59.367Z",
"contributors": [
@@ -17951,6 +17945,12 @@
"Wind1808"
]
},
+ "Web/API/MediaRecorder/dataavailable_event": {
+ "modified": "2020-10-15T22:18:01.594Z",
+ "contributors": [
+ "Wind1808"
+ ]
+ },
"Web/API/MediaRecorder/error_event": {
"modified": "2020-10-15T22:18:20.005Z",
"contributors": [
@@ -17971,62 +17971,44 @@
"Wind1808"
]
},
- "Web/API/MediaRecorder/ondataavailable": {
- "modified": "2020-10-15T22:18:01.594Z",
- "contributors": [
- "Wind1808"
- ]
- },
- "Web/API/MediaRecorder/onerror": {
- "modified": "2020-10-15T22:18:05.909Z",
+ "Web/API/MediaRecorder/pause": {
+ "modified": "2020-10-15T22:18:16.534Z",
"contributors": [
"Wind1808"
]
},
- "Web/API/MediaRecorder/onpause": {
+ "Web/API/MediaRecorder/pause_event": {
"modified": "2020-10-15T22:18:02.845Z",
"contributors": [
"Wind1808"
]
},
- "Web/API/MediaRecorder/onresume": {
- "modified": "2020-10-15T22:18:05.523Z",
- "contributors": [
- "Wind1808"
- ]
- },
- "Web/API/MediaRecorder/onstart": {
- "modified": "2020-10-15T22:18:00.782Z",
- "contributors": [
- "Wind1808"
- ]
- },
- "Web/API/MediaRecorder/onstop": {
- "modified": "2020-10-15T22:18:01.731Z",
+ "Web/API/MediaRecorder/requestData": {
+ "modified": "2020-10-15T22:18:17.551Z",
"contributors": [
"Wind1808"
]
},
- "Web/API/MediaRecorder/pause": {
- "modified": "2020-10-15T22:18:16.534Z",
+ "Web/API/MediaRecorder/resume": {
+ "modified": "2020-10-15T22:18:17.460Z",
"contributors": [
"Wind1808"
]
},
- "Web/API/MediaRecorder/requestData": {
- "modified": "2020-10-15T22:18:17.551Z",
+ "Web/API/MediaRecorder/resume_event": {
+ "modified": "2020-10-15T22:18:05.523Z",
"contributors": [
"Wind1808"
]
},
- "Web/API/MediaRecorder/resume": {
- "modified": "2020-10-15T22:18:17.460Z",
+ "Web/API/MediaRecorder/start": {
+ "modified": "2020-10-15T22:18:17.659Z",
"contributors": [
"Wind1808"
]
},
- "Web/API/MediaRecorder/start": {
- "modified": "2020-10-15T22:18:17.659Z",
+ "Web/API/MediaRecorder/start_event": {
+ "modified": "2020-10-15T22:18:00.782Z",
"contributors": [
"Wind1808"
]
@@ -18043,6 +18025,12 @@
"Wind1808"
]
},
+ "Web/API/MediaRecorder/stop_event": {
+ "modified": "2020-10-15T22:18:01.731Z",
+ "contributors": [
+ "Wind1808"
+ ]
+ },
"Web/API/MediaRecorder/stream": {
"modified": "2020-10-15T22:18:16.438Z",
"contributors": [
@@ -25100,7 +25088,7 @@
"lv7777"
]
},
- "Web/API/Worker/onerror": {
+ "Web/API/Worker/error_event": {
"modified": "2020-10-15T22:02:48.424Z",
"contributors": [
"chikoski"
@@ -48203,6 +48191,12 @@
"sii"
]
},
+ "conflicting/Learn_5c079fa29d8d329cb43586076f0bb7bf": {
+ "modified": "2020-09-28T09:40:44.944Z",
+ "contributors": [
+ "silverskyvicto"
+ ]
+ },
"conflicting/MDN/Contribute/Markdown_in_MDN": {
"modified": "2020-09-30T15:30:25.061Z",
"contributors": [
@@ -48343,6 +48337,12 @@
"e53e04ac"
]
},
+ "conflicting/Web/API/MediaRecorder/error_event": {
+ "modified": "2020-10-15T22:18:05.909Z",
+ "contributors": [
+ "Wind1808"
+ ]
+ },
"conflicting/Web/API/Navigator/onLine": {
"modified": "2019-03-23T23:53:08.504Z",
"contributors": [
diff --git a/files/ja/learn/release_notes/index.html b/files/ja/conflicting/learn_5c079fa29d8d329cb43586076f0bb7bf/index.html
index 983ad71fef..a5daf4cc37 100644
--- a/files/ja/learn/release_notes/index.html
+++ b/files/ja/conflicting/learn_5c079fa29d8d329cb43586076f0bb7bf/index.html
@@ -1,10 +1,11 @@
---
title: 学習エリアのリリースノート
-slug: Learn/Release_notes
+slug: conflicting/Learn_5c079fa29d8d329cb43586076f0bb7bf
tags:
- Learn
- Release Notes
translation_of: Learn/Release_notes
+original_slug: Learn/Release_notes
---
<div>{{learnsidebar}}</div>
diff --git a/files/ja/web/api/mediarecorder/onerror/index.html b/files/ja/conflicting/web/api/mediarecorder/error_event/index.html
index 204f327a23..dcd1a3b7af 100644
--- a/files/ja/web/api/mediarecorder/onerror/index.html
+++ b/files/ja/conflicting/web/api/mediarecorder/error_event/index.html
@@ -1,6 +1,6 @@
---
title: MediaRecorder.onerror
-slug: Web/API/MediaRecorder/onerror
+slug: conflicting/Web/API/MediaRecorder/error_event
tags:
- API
- Audio
@@ -12,6 +12,7 @@ tags:
- Video
- onerror
translation_of: Web/API/MediaRecorder/onerror
+original_slug: Web/API/MediaRecorder/onerror
---
<div>{{APIRef("MediaStream Recording")}}</div>
diff --git a/files/ja/web/api/mediarecorder/ondataavailable/index.html b/files/ja/web/api/mediarecorder/dataavailable_event/index.html
index 5d3dbcaf15..22c391d0a7 100644
--- a/files/ja/web/api/mediarecorder/ondataavailable/index.html
+++ b/files/ja/web/api/mediarecorder/dataavailable_event/index.html
@@ -1,6 +1,6 @@
---
title: MediaRecorder.ondataavailable
-slug: Web/API/MediaRecorder/ondataavailable
+slug: Web/API/MediaRecorder/dataavailable_event
tags:
- API
- Audio
@@ -13,6 +13,7 @@ tags:
- Video
- ondataavailable
translation_of: Web/API/MediaRecorder/ondataavailable
+original_slug: Web/API/MediaRecorder/ondataavailable
---
<p>{{APIRef("MediaStream Recording")}}</p>
diff --git a/files/ja/web/api/mediarecorder/onpause/index.html b/files/ja/web/api/mediarecorder/pause_event/index.html
index b045532e43..1227e4bfe7 100644
--- a/files/ja/web/api/mediarecorder/onpause/index.html
+++ b/files/ja/web/api/mediarecorder/pause_event/index.html
@@ -1,6 +1,6 @@
---
title: MediaRecorder.onpause
-slug: Web/API/MediaRecorder/onpause
+slug: Web/API/MediaRecorder/pause_event
tags:
- API
- Audio
@@ -12,6 +12,7 @@ tags:
- Video
- onpause
translation_of: Web/API/MediaRecorder/onpause
+original_slug: Web/API/MediaRecorder/onpause
---
<p>{{APIRef("Media Recorder API")}}</p>
diff --git a/files/ja/web/api/mediarecorder/onresume/index.html b/files/ja/web/api/mediarecorder/resume_event/index.html
index c22cffee41..82b13f5a24 100644
--- a/files/ja/web/api/mediarecorder/onresume/index.html
+++ b/files/ja/web/api/mediarecorder/resume_event/index.html
@@ -1,6 +1,6 @@
---
title: MediaRecorder.onresume
-slug: Web/API/MediaRecorder/onresume
+slug: Web/API/MediaRecorder/resume_event
tags:
- API
- Audio
@@ -12,6 +12,7 @@ tags:
- Video
- onresume
translation_of: Web/API/MediaRecorder/onresume
+original_slug: Web/API/MediaRecorder/onresume
---
<p>{{APIRef("Media Recorder API")}}</p>
diff --git a/files/ja/web/api/mediarecorder/onstart/index.html b/files/ja/web/api/mediarecorder/start_event/index.html
index 0d452d4473..36d9ebfc9c 100644
--- a/files/ja/web/api/mediarecorder/onstart/index.html
+++ b/files/ja/web/api/mediarecorder/start_event/index.html
@@ -1,6 +1,6 @@
---
title: MediaRecorder.onstart
-slug: Web/API/MediaRecorder/onstart
+slug: Web/API/MediaRecorder/start_event
tags:
- API
- Audio
@@ -12,6 +12,7 @@ tags:
- Video
- onstart
translation_of: Web/API/MediaRecorder/onstart
+original_slug: Web/API/MediaRecorder/onstart
---
<div>{{APIRef("Media Recorder API")}}</div>
diff --git a/files/ja/web/api/mediarecorder/onstop/index.html b/files/ja/web/api/mediarecorder/stop_event/index.html
index d639d9441b..155a581554 100644
--- a/files/ja/web/api/mediarecorder/onstop/index.html
+++ b/files/ja/web/api/mediarecorder/stop_event/index.html
@@ -1,6 +1,6 @@
---
title: MediaRecorder.onstop
-slug: Web/API/MediaRecorder/onstop
+slug: Web/API/MediaRecorder/stop_event
tags:
- API
- Audio
@@ -12,6 +12,7 @@ tags:
- Video
- onstop
translation_of: Web/API/MediaRecorder/onstop
+original_slug: Web/API/MediaRecorder/onstop
---
<div>{{APIRef("Media Recorder API")}}</div>
diff --git a/files/ja/web/api/worker/onerror/index.html b/files/ja/web/api/worker/error_event/index.html
index 2864938ea0..4e2d55a89b 100644
--- a/files/ja/web/api/worker/onerror/index.html
+++ b/files/ja/web/api/worker/error_event/index.html
@@ -1,6 +1,6 @@
---
title: Worker.onerror
-slug: Web/API/Worker/onerror
+slug: Web/API/Worker/error_event
tags:
- API
- Worker
@@ -10,8 +10,9 @@ tags:
- Web Workers
- Workers
- onerror
-browser-compat: api.Worker.onerror
translation_of: Web/API/Worker/onerror
+original_slug: Web/API/Worker/onerror
+browser-compat: api.Worker.onerror
---
<div>{{APIRef("Web Workers API")}}</div>
diff --git a/files/pt-br/_redirects.txt b/files/pt-br/_redirects.txt
index 91690e911a..f852975d04 100644
--- a/files/pt-br/_redirects.txt
+++ b/files/pt-br/_redirects.txt
@@ -75,7 +75,7 @@
/pt-BR/docs/Aprender/JavaScript/Objetos/Object_building_practice /pt-BR/docs/Learn/JavaScript/Objects/Object_building_practice
/pt-BR/docs/Aprender/JavaScript/Objetos/Object_prototypes /pt-BR/docs/Learn/JavaScript/Objects/Object_prototypes
/pt-BR/docs/Aprender/Learning_and_getting_help /pt-BR/docs/Learn/Learning_and_getting_help
-/pt-BR/docs/Aprender/Release_notes /pt-BR/docs/Learn/Release_notes
+/pt-BR/docs/Aprender/Release_notes /pt-BR/docs/conflicting/Learn
/pt-BR/docs/CSS /pt-BR/docs/Web/CSS
/pt-BR/docs/CSS/@page /pt-BR/docs/Web/CSS/@page
/pt-BR/docs/CSS/At-rule /pt-BR/docs/Web/CSS/At-rule
@@ -405,6 +405,7 @@
/pt-BR/docs/Learn/JavaScript/First_steps/Variáveis /pt-BR/docs/Learn/JavaScript/First_steps/Variables
/pt-BR/docs/Learn/JavaScript/Objects/Inheritance /pt-BR/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
/pt-BR/docs/Learn/JavaScript/Objects/Object-oriented_JS /pt-BR/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
+/pt-BR/docs/Learn/Release_notes /pt-BR/docs/conflicting/Learn
/pt-BR/docs/Learn/Server-side/Django/Hospedagem /pt-BR/docs/Learn/Server-side/Django/Deployment
/pt-BR/docs/Learn/Server-side/Django/Introdução /pt-BR/docs/Learn/Server-side/Django/Introduction
/pt-BR/docs/Learn/Server-side/Django/Sessões /pt-BR/docs/Learn/Server-side/Django/Sessions
diff --git a/files/pt-br/_wikihistory.json b/files/pt-br/_wikihistory.json
index 6041ed758b..26a483ad31 100644
--- a/files/pt-br/_wikihistory.json
+++ b/files/pt-br/_wikihistory.json
@@ -2345,12 +2345,6 @@
"GiovanniHD201E"
]
},
- "Learn/Release_notes": {
- "modified": "2020-10-15T20:54:28.940Z",
- "contributors": [
- "3ltons"
- ]
- },
"Learn/Server-side": {
"modified": "2020-07-16T22:36:01.419Z",
"contributors": [
@@ -16185,6 +16179,12 @@
"AlanCezarAraujo"
]
},
+ "conflicting/Learn": {
+ "modified": "2020-10-15T20:54:28.940Z",
+ "contributors": [
+ "3ltons"
+ ]
+ },
"conflicting/Learn/CSS/Building_blocks/Cascade_and_inheritance": {
"modified": "2019-03-23T22:55:03.103Z",
"contributors": [
diff --git a/files/pt-br/learn/release_notes/index.html b/files/pt-br/conflicting/learn/index.html
index 017349a842..976dba4686 100644
--- a/files/pt-br/learn/release_notes/index.html
+++ b/files/pt-br/conflicting/learn/index.html
@@ -1,8 +1,8 @@
---
title: Learning area release notes
-slug: Learn/Release_notes
+slug: conflicting/Learn
translation_of: Learn/Release_notes
-original_slug: Aprender/Release_notes
+original_slug: Learn/Release_notes
---
<div>{{learnsidebar}}</div>
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index 076f9409bb..c9aa710795 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -353,6 +353,7 @@
/ru/docs/Web/API/HTMLHyperlinkElementUtils/username /ru/docs/Web/API/HTMLAnchorElement/username
/ru/docs/Web/API/HTMLImageElement.Image /ru/docs/Web/API/HTMLImageElement/Image
/ru/docs/Web/API/KeyboardEvent/which /ru/docs/Web/API/UIEvent/which
+/ru/docs/Web/API/MediaRecorder/ondataavailable /ru/docs/Web/API/MediaRecorder/dataavailable_event
/ru/docs/Web/API/MouseEvent/which /ru/docs/conflicting/Web/API/UIEvent/which
/ru/docs/Web/API/NetworkInformation/connection /ru/docs/Web/API/Navigator/connection
/ru/docs/Web/API/Node.appendChild /ru/docs/Web/API/Node/appendChild
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index a348d4fe1e..17f599b98d 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -9269,7 +9269,7 @@
"draedful"
]
},
- "Web/API/MediaRecorder/ondataavailable": {
+ "Web/API/MediaRecorder/dataavailable_event": {
"modified": "2020-10-15T21:52:00.316Z",
"contributors": [
"mechtool",
diff --git a/files/ru/web/api/mediarecorder/ondataavailable/index.html b/files/ru/web/api/mediarecorder/dataavailable_event/index.html
index a111bdaacd..ef0a2f9cdb 100644
--- a/files/ru/web/api/mediarecorder/ondataavailable/index.html
+++ b/files/ru/web/api/mediarecorder/dataavailable_event/index.html
@@ -1,7 +1,8 @@
---
title: MediaRecorder.ondataavailable
-slug: Web/API/MediaRecorder/ondataavailable
+slug: Web/API/MediaRecorder/dataavailable_event
translation_of: Web/API/MediaRecorder/ondataavailable
+original_slug: Web/API/MediaRecorder/ondataavailable
---
<p>{{APIRef("MediaStream Recording")}}</p>
diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 73596ab89d..3b9ee0afb5 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1416,6 +1416,7 @@
/zh-CN/docs/Web/API/Location.replace /zh-CN/docs/Web/API/Location/replace
/zh-CN/docs/Web/API/MediaCapabilitiesInfo /zh-CN/docs/Web/API/MediaCapabilities/encodingInfo
/zh-CN/docs/Web/API/MediaDevices/ondevicechange /zh-CN/docs/conflicting/Web/API/MediaDevices/devicechange_event
+/zh-CN/docs/Web/API/MediaRecorder/ondataavailable /zh-CN/docs/Web/API/MediaRecorder/dataavailable_event
/zh-CN/docs/Web/API/MediaStream.addTrack /zh-CN/docs/Web/API/MediaStream/addTrack
/zh-CN/docs/Web/API/MouseEvent/which /zh-CN/docs/conflicting/Web/API/UIEvent/which
/zh-CN/docs/Web/API/MouseWheelEvent /zh-CN/docs/conflicting/Web/API/WheelEvent
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 3fd874797f..4dcfa7ff44 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -16683,6 +16683,13 @@
"forgamer"
]
},
+ "Web/API/MediaRecorder/dataavailable_event": {
+ "modified": "2020-10-15T22:28:21.731Z",
+ "contributors": [
+ "BMud",
+ "baixiaocun"
+ ]
+ },
"Web/API/MediaRecorder/isTypeSupported": {
"modified": "2019-06-06T05:26:50.779Z",
"contributors": [
@@ -16691,13 +16698,6 @@
"wakingking77"
]
},
- "Web/API/MediaRecorder/ondataavailable": {
- "modified": "2020-10-15T22:28:21.731Z",
- "contributors": [
- "BMud",
- "baixiaocun"
- ]
- },
"Web/API/MediaRecorder/pause": {
"modified": "2020-10-15T22:22:08.111Z",
"contributors": [
diff --git a/files/zh-cn/web/api/mediarecorder/ondataavailable/index.html b/files/zh-cn/web/api/mediarecorder/dataavailable_event/index.html
index 48392d0689..4daaf213e8 100644
--- a/files/zh-cn/web/api/mediarecorder/ondataavailable/index.html
+++ b/files/zh-cn/web/api/mediarecorder/dataavailable_event/index.html
@@ -1,7 +1,8 @@
---
title: MediaRecorder.ondataavailable
-slug: Web/API/MediaRecorder/ondataavailable
+slug: Web/API/MediaRecorder/dataavailable_event
translation_of: Web/API/MediaRecorder/ondataavailable
+original_slug: Web/API/MediaRecorder/ondataavailable
---
<p><font><font>{{APIRef("MediaStream Recording")}}</font></font></p>