aboutsummaryrefslogtreecommitdiff
path: root/files/es
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2021-10-14 00:47:38 +0000
committerMDN <actions@users.noreply.github.com>2021-10-14 00:47:38 +0000
commitdf821208c608de1b7cdc6fe69ae28724ac1f01a0 (patch)
tree265d5165067499173a2b36626798e3504b291909 /files/es
parentd362676d3d14ab1bf938c80a90b7a6f2665d9f3c (diff)
downloadtranslated-content-df821208c608de1b7cdc6fe69ae28724ac1f01a0.tar.gz
translated-content-df821208c608de1b7cdc6fe69ae28724ac1f01a0.tar.bz2
translated-content-df821208c608de1b7cdc6fe69ae28724ac1f01a0.zip
[CRON] sync translated content
Diffstat (limited to 'files/es')
-rw-r--r--files/es/_redirects.txt3
-rw-r--r--files/es/_wikihistory.json12
-rw-r--r--files/es/conflicting/web/css/media_queries/using_media_queries/index.html (renamed from files/es/web/progressive_web_apps/responsive/media_types/index.html)4
3 files changed, 10 insertions, 9 deletions
diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt
index a224a5b8a0..1f7c5887bb 100644
--- a/files/es/_redirects.txt
+++ b/files/es/_redirects.txt
@@ -1670,7 +1670,7 @@
/es/docs/Web/CSS/Gradiente /es/docs/Web/CSS/gradient
/es/docs/Web/CSS/Herramientas /es/docs/conflicting/Web/CSS
/es/docs/Web/CSS/Introducción/Content /es/docs/Learn/CSS/Howto/Generated_content
-/es/docs/Web/CSS/Introducción/Media /es/docs/Web/Progressive_web_apps/Responsive/Media_types
+/es/docs/Web/CSS/Introducción/Media /es/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/es/docs/Web/CSS/Preguntas_frecuentes_sobre_CSS /es/docs/Learn/CSS/Howto/CSS_FAQ
/es/docs/Web/CSS/Pseudoelementos /es/docs/Web/CSS/Pseudo-elements
/es/docs/Web/CSS/Referencia_CSS /es/docs/Web/CSS/Reference
@@ -2497,6 +2497,7 @@
/es/docs/Web/Performance/mejorando_rendimienot_inicial /es/docs/Web/Performance/Optimizing_startup_performance
/es/docs/Web/Progressive_web_apps/Developer_guide/Instalar /es/docs/Web/Progressive_web_apps/Installing
/es/docs/Web/Progressive_web_apps/Developer_guide/Installing /es/docs/Web/Progressive_web_apps/Installing
+/es/docs/Web/Progressive_web_apps/Responsive/Media_types /es/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/es/docs/Web/Reference/Events /es/docs/Web/Events
/es/docs/Web/Reference/Events/animationend /es/docs/Web/API/HTMLElement/animationend_event
/es/docs/Web/Reference/Events/beforeunload /es/docs/Web/API/Window/beforeunload_event
diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json
index 1c5f685def..0621825c2c 100644
--- a/files/es/_wikihistory.json
+++ b/files/es/_wikihistory.json
@@ -20376,12 +20376,6 @@
"Nachec"
]
},
- "Web/Progressive_web_apps/Responsive/Media_types": {
- "modified": "2019-03-18T21:15:11.297Z",
- "contributors": [
- "luismj"
- ]
- },
"Web/SVG": {
"modified": "2019-03-23T23:44:20.243Z",
"contributors": [
@@ -21529,6 +21523,12 @@
"miguelsp"
]
},
+ "conflicting/Web/CSS/Media_Queries/Using_media_queries": {
+ "modified": "2019-03-18T21:15:11.297Z",
+ "contributors": [
+ "luismj"
+ ]
+ },
"conflicting/Web/CSS/cursor": {
"modified": "2019-03-23T22:35:57.612Z",
"contributors": [
diff --git a/files/es/web/progressive_web_apps/responsive/media_types/index.html b/files/es/conflicting/web/css/media_queries/using_media_queries/index.html
index 122b374df8..f585d9f669 100644
--- a/files/es/web/progressive_web_apps/responsive/media_types/index.html
+++ b/files/es/conflicting/web/css/media_queries/using_media_queries/index.html
@@ -1,8 +1,8 @@
---
title: Media
-slug: Web/Progressive_web_apps/Responsive/Media_types
+slug: conflicting/Web/CSS/Media_Queries/Using_media_queries
translation_of: Web/Progressive_web_apps/Responsive/Media_types
-original_slug: Web/CSS/Introducción/Media
+original_slug: Web/Progressive_web_apps/Responsive/Media_types
---
<p>{{CSSTutorialTOC}} {{previousPage("/en-US/docs/Web/Guide/CSS/Getting_Started/Tables", "Tables")}}</p>