aboutsummaryrefslogtreecommitdiff
path: root/files/ru
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2021-09-28 00:50:31 +0000
committerMDN <actions@users.noreply.github.com>2021-09-28 00:50:31 +0000
commit52e48a7ac7bfc64b78c5aabb86cab4c0d7b88054 (patch)
treeda6d856de98ad3aa793cd8f3986b3fb4bb9c1c71 /files/ru
parent996ebd1c41727cdad43e5709e190132368d0bd9b (diff)
downloadtranslated-content-52e48a7ac7bfc64b78c5aabb86cab4c0d7b88054.tar.gz
translated-content-52e48a7ac7bfc64b78c5aabb86cab4c0d7b88054.tar.bz2
translated-content-52e48a7ac7bfc64b78c5aabb86cab4c0d7b88054.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/web_components/index.html (renamed from files/ru/web/web_components/html_imports/index.html)3
3 files changed, 9 insertions, 7 deletions
diff --git a/files/ru/_redirects.txt b/files/ru/_redirects.txt
index b61407949d..dcdb318df3 100644
--- a/files/ru/_redirects.txt
+++ b/files/ru/_redirects.txt
@@ -675,6 +675,7 @@
/ru/docs/Web/WebGL/Animating_objects_with_WebGL /ru/docs/Web/API/WebGL_API/Tutorial/Animating_objects_with_WebGL
/ru/docs/Web/WebGL/Getting_started_with_WebGL /ru/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL
/ru/docs/Web/WebGL/Using_shaders_to_apply_color_in_WebGL /ru/docs/Web/API/WebGL_API/Tutorial/Using_shaders_to_apply_color_in_WebGL
+/ru/docs/Web/Web_Components/HTML_Imports /ru/docs/conflicting/Web/Web_Components
/ru/docs/Web/Web_Components/Использование_пользовательских_элементов /ru/docs/Web/Web_Components/Using_custom_elements
/ru/docs/Web/XPath/Funkcje /ru/docs/Web/XPath/Functions
/ru/docs/Web/XPath/Funkcje/floor /ru/docs/Web/XPath/Functions/floor
diff --git a/files/ru/_wikihistory.json b/files/ru/_wikihistory.json
index d77429f430..716c988409 100644
--- a/files/ru/_wikihistory.json
+++ b/files/ru/_wikihistory.json
@@ -23845,12 +23845,6 @@
"Kalita-Roman"
]
},
- "Web/Web_Components/HTML_Imports": {
- "modified": "2019-03-18T21:40:10.986Z",
- "contributors": [
- "PaulineNemchak"
- ]
- },
"Web/Web_Components/Using_custom_elements": {
"modified": "2020-01-05T09:04:07.966Z",
"contributors": [
@@ -24697,6 +24691,12 @@
"ruslan_g02"
]
},
+ "conflicting/Web/Web_Components": {
+ "modified": "2019-03-18T21:40:10.986Z",
+ "contributors": [
+ "PaulineNemchak"
+ ]
+ },
"orphaned/Glossary/Polifill": {
"modified": "2019-03-23T22:18:26.835Z",
"contributors": [
diff --git a/files/ru/web/web_components/html_imports/index.html b/files/ru/conflicting/web/web_components/index.html
index 06dab35aba..71cfa2e114 100644
--- a/files/ru/web/web_components/html_imports/index.html
+++ b/files/ru/conflicting/web/web_components/index.html
@@ -1,7 +1,8 @@
---
title: HTML Импорты
-slug: Web/Web_Components/HTML_Imports
+slug: conflicting/Web/Web_Components
translation_of: Web/Web_Components/HTML_Imports
+original_slug: Web/Web_Components/HTML_Imports
---
<div class="warning">
<p>Firefox will not ship <em>HTML Imports</em> in its current form. See this <a href="https://hacks.mozilla.org/2015/06/the-state-of-web-components/">status update</a> for more information. Until there is a consensus on the standard or alternative mechanisms are worked out, you can use a polyfill such as Google's <code><a href="https://github.com/webcomponents/webcomponentsjs">webcomponents.js</a></code>.</p>