aboutsummaryrefslogtreecommitdiff
path: root/files/ru
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2022-01-16 00:57:29 +0000
committerMDN <actions@users.noreply.github.com>2022-01-16 00:57:29 +0000
commit32ce5de47456ff5d8cb1b2d9163356ce27ffe955 (patch)
tree44e7c321352aaeaf6996c758a2355cde9ac56c70 /files/ru
parent2643908ba6acced84a9e92dbd037fc3c62f10b15 (diff)
downloadtranslated-content-32ce5de47456ff5d8cb1b2d9163356ce27ffe955.tar.gz
translated-content-32ce5de47456ff5d8cb1b2d9163356ce27ffe955.tar.bz2
translated-content-32ce5de47456ff5d8cb1b2d9163356ce27ffe955.zip
[CRON] sync translated content
Diffstat (limited to 'files/ru')
-rw-r--r--files/ru/_redirects.txt1
-rw-r--r--files/ru/_wikihistory.json12
-rw-r--r--files/ru/conflicting/web/api/pointer_events/index.html (renamed from files/ru/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html)3
3 files changed, 9 insertions, 7 deletions
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index b6ded722e2..f32afa34e2 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -364,6 +364,7 @@
/ru/docs/Web/API/PositionError /ru/docs/Web/API/GeolocationPositionError
/ru/docs/Web/API/PositionOptions /ru/docs/conflicting/Web/API/Geolocation/getCurrentPosition
/ru/docs/Web/API/RandomSource/getRandomValues /ru/docs/Web/API/Crypto/getRandomValues
+/ru/docs/Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent /ru/docs/conflicting/Web/API/Pointer_events
/ru/docs/Web/API/USB/onconnect /ru/docs/Web/API/USB/connect_event
/ru/docs/Web/API/USB/ondisconnect /ru/docs/Web/API/USB/disconnect_event
/ru/docs/Web/API/WebGL_API/Adding_2D_content_to_a_WebGL_context /ru/docs/Web/API/WebGL_API/Tutorial/Adding_2D_content_to_a_WebGL_context
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index 1e6f4922fc..7a042b1535 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -10477,12 +10477,6 @@
"surrsoft"
]
},
- "Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent": {
- "modified": "2020-08-27T17:02:59.997Z",
- "contributors": [
- "hisbvdis"
- ]
- },
"Web/API/Touch_events/Using_Touch_Events": {
"modified": "2020-09-03T17:23:38.278Z",
"contributors": [
@@ -24197,6 +24191,12 @@
"AlexAlex"
]
},
+ "conflicting/Web/API/Pointer_events": {
+ "modified": "2020-08-27T17:02:59.997Z",
+ "contributors": [
+ "hisbvdis"
+ ]
+ },
"conflicting/Web/API/Push_API": {
"modified": "2019-03-23T22:33:26.535Z",
"contributors": [
diff --git a/files/ru/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html b/files/ru/conflicting/web/api/pointer_events/index.html
index d9f05fdec0..6752043059 100644
--- a/files/ru/web/api/touch_events/supporting_both_touchevent_and_mouseevent/index.html
+++ b/files/ru/conflicting/web/api/pointer_events/index.html
@@ -1,7 +1,8 @@
---
title: Поддержка TouchEvent и MouseEvent
-slug: Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent
+slug: conflicting/Web/API/Pointer_events
translation_of: Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent
+original_slug: Web/API/Touch_events/Supporting_both_TouchEvent_and_MouseEvent
---
<p>{{DefaultAPISidebar("Touch Events")}}</p>