aboutsummaryrefslogtreecommitdiff
path: root/files/pt-br/conflicting/learn
diff options
context:
space:
mode:
authorFlorian Merz <me@fiji-flo.de>2021-02-11 14:49:58 +0100
committerFlorian Merz <me@fiji-flo.de>2021-02-11 14:49:58 +0100
commit1d435be33d8b76cd7b06cd06996c19d74f83cfd4 (patch)
tree86057a0d5693744915564716a97ba7466c041e6e /files/pt-br/conflicting/learn
parent68fc8e96a9629e73469ed457abd955e548ec670c (diff)
downloadtranslated-content-1d435be33d8b76cd7b06cd06996c19d74f83cfd4.tar.gz
translated-content-1d435be33d8b76cd7b06cd06996c19d74f83cfd4.tar.bz2
translated-content-1d435be33d8b76cd7b06cd06996c19d74f83cfd4.zip
unslug pt-br: modify
Diffstat (limited to 'files/pt-br/conflicting/learn')
-rw-r--r--files/pt-br/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html3
-rw-r--r--files/pt-br/conflicting/learn/css/building_blocks/selectors/index.html3
-rw-r--r--files/pt-br/conflicting/learn/css/first_steps/how_css_works/index.html5
-rw-r--r--files/pt-br/conflicting/learn/css/first_steps/how_css_works_199dae2aa1447fa94457a213c989744d/index.html4
-rw-r--r--files/pt-br/conflicting/learn/css/first_steps/how_css_works_61240ddc35a4ddd533ea33cc8ccf1c87/index.html4
-rw-r--r--files/pt-br/conflicting/learn/css/first_steps/index.html3
-rw-r--r--files/pt-br/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html3
-rw-r--r--files/pt-br/conflicting/learn/javascript/objects/index.html3
8 files changed, 19 insertions, 9 deletions
diff --git a/files/pt-br/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html b/files/pt-br/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
index 7880e00f6d..24d7a8a170 100644
--- a/files/pt-br/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
+++ b/files/pt-br/conflicting/learn/css/building_blocks/cascade_and_inheritance/index.html
@@ -1,11 +1,12 @@
---
title: Cascata e herança
-slug: Web/CSS/Getting_Started/Cascading_and_inheritance
+slug: conflicting/Learn/CSS/Building_blocks/Cascade_and_inheritance
tags:
- Guía
- Iniciante
translation_of: Learn/CSS/Building_blocks/Cascade_and_inheritance
translation_of_original: Web/Guide/CSS/Getting_started/Cascading_and_inheritance
+original_slug: Web/CSS/Getting_Started/Cascading_and_inheritance
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/pt-br/conflicting/learn/css/building_blocks/selectors/index.html b/files/pt-br/conflicting/learn/css/building_blocks/selectors/index.html
index 3870c68936..a04b285c4e 100644
--- a/files/pt-br/conflicting/learn/css/building_blocks/selectors/index.html
+++ b/files/pt-br/conflicting/learn/css/building_blocks/selectors/index.html
@@ -1,8 +1,9 @@
---
title: Seletores
-slug: Web/CSS/Getting_Started/Seletores
+slug: conflicting/Learn/CSS/Building_blocks/Selectors
translation_of: Learn/CSS/Building_blocks/Selectors
translation_of_original: Web/Guide/CSS/Getting_started/Selectors
+original_slug: Web/CSS/Getting_Started/Seletores
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/pt-br/conflicting/learn/css/first_steps/how_css_works/index.html b/files/pt-br/conflicting/learn/css/first_steps/how_css_works/index.html
index 2ead5ccae7..6a66017083 100644
--- a/files/pt-br/conflicting/learn/css/first_steps/how_css_works/index.html
+++ b/files/pt-br/conflicting/learn/css/first_steps/how_css_works/index.html
@@ -1,13 +1,14 @@
---
title: Como o CSS funciona
-slug: Web/CSS/Getting_Started/Como_CSS_funciona
+slug: conflicting/Learn/CSS/First_steps/How_CSS_works
tags:
- - 'CSS:PrimeirosPassos'
+ - CSS:PrimeirosPassos
- Guía
- Iniciante
- Web
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/How_CSS_works
+original_slug: Web/CSS/Getting_Started/Como_CSS_funciona
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/pt-br/conflicting/learn/css/first_steps/how_css_works_199dae2aa1447fa94457a213c989744d/index.html b/files/pt-br/conflicting/learn/css/first_steps/how_css_works_199dae2aa1447fa94457a213c989744d/index.html
index 1ccc04f0ce..8050022bae 100644
--- a/files/pt-br/conflicting/learn/css/first_steps/how_css_works_199dae2aa1447fa94457a213c989744d/index.html
+++ b/files/pt-br/conflicting/learn/css/first_steps/how_css_works_199dae2aa1447fa94457a213c989744d/index.html
@@ -1,8 +1,10 @@
---
title: O que é CSS
-slug: Web/CSS/Getting_Started/Oque_&eacute;_CSS
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_199dae2aa1447fa94457a213c989744d
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/What_is_CSS
+original_slug: Web/CSS/Getting_Started/Oque_&eacute;_CSS
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/pt-br/conflicting/learn/css/first_steps/how_css_works_61240ddc35a4ddd533ea33cc8ccf1c87/index.html b/files/pt-br/conflicting/learn/css/first_steps/how_css_works_61240ddc35a4ddd533ea33cc8ccf1c87/index.html
index 453aa4c966..cf66eb6b51 100644
--- a/files/pt-br/conflicting/learn/css/first_steps/how_css_works_61240ddc35a4ddd533ea33cc8ccf1c87/index.html
+++ b/files/pt-br/conflicting/learn/css/first_steps/how_css_works_61240ddc35a4ddd533ea33cc8ccf1c87/index.html
@@ -1,8 +1,10 @@
---
title: Por que usar CSS?
-slug: Web/CSS/Getting_Started/Porque_usar_CSS
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_61240ddc35a4ddd533ea33cc8ccf1c87
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/Why_use_CSS
+original_slug: Web/CSS/Getting_Started/Porque_usar_CSS
---
<p><span style="line-height: 1.5;">{{ CSSTutorialTOC() }}</span></p>
diff --git a/files/pt-br/conflicting/learn/css/first_steps/index.html b/files/pt-br/conflicting/learn/css/first_steps/index.html
index 389962ab07..c5d5ad680c 100644
--- a/files/pt-br/conflicting/learn/css/first_steps/index.html
+++ b/files/pt-br/conflicting/learn/css/first_steps/index.html
@@ -1,6 +1,6 @@
---
title: Iniciando com o CSS
-slug: Web/CSS/Getting_Started
+slug: conflicting/Learn/CSS/First_steps
tags:
- CSS
- Guia(2)
@@ -9,6 +9,7 @@ tags:
- Web
translation_of: Learn/CSS/First_steps
translation_of_original: Web/Guide/CSS/Getting_started
+original_slug: Web/CSS/Getting_Started
---
<p> </p>
diff --git a/files/pt-br/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html b/files/pt-br/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
index 4577341105..6b1c4dcec9 100644
--- a/files/pt-br/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
+++ b/files/pt-br/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
@@ -1,8 +1,9 @@
---
title: Utilizando áudio e vídeo com HTML5
-slug: Web/HTML/Using_HTML5_audio_and_video
+slug: conflicting/Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
translation_of: Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
translation_of_original: Web/Guide/HTML/Using_HTML5_audio_and_video
+original_slug: Web/HTML/Using_HTML5_audio_and_video
---
<p style="margin-left: 40px;">O HTML5 introduz o suporte de mídia embutido por meio dos elementos {{ HTMLElement("audio") }} e {{ HTMLElement("video") }}, oferecendo a possibilidade de incorporar facilmente mídia em documentos HTML.</p>
diff --git a/files/pt-br/conflicting/learn/javascript/objects/index.html b/files/pt-br/conflicting/learn/javascript/objects/index.html
index aaab9150b3..76ab6bff3d 100644
--- a/files/pt-br/conflicting/learn/javascript/objects/index.html
+++ b/files/pt-br/conflicting/learn/javascript/objects/index.html
@@ -1,6 +1,6 @@
---
title: Introdução ao JavaScript Orientado a Objeto
-slug: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript
+slug: conflicting/Learn/JavaScript/Objects
tags:
- Construtor
- Encapsular
@@ -12,6 +12,7 @@ tags:
- POO
translation_of: Learn/JavaScript/Objects
translation_of_original: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript
+original_slug: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript
---
<p>JavaScript tem fortes capacidades de programação orientada a objetos, apesar de ocorrerem algumas discussões devido às diferenças da orientação a objetos no JavaScript em comparação com outras linguagens.</p>