aboutsummaryrefslogtreecommitdiff
path: root/files/de/conflicting/learn
diff options
context:
space:
mode:
authorFlorian Merz <me@fiji-flo.de>2021-02-11 14:45:38 +0100
committerFlorian Merz <me@fiji-flo.de>2021-02-11 14:45:38 +0100
commit12b585b8e60a2877ff64dc6dc5ab058c43652f47 (patch)
tree022e6a59b4a0504d15853edfa8d3370521d8653d /files/de/conflicting/learn
parent4ab365b110f2f1f2b736326b7059244a32115089 (diff)
downloadtranslated-content-12b585b8e60a2877ff64dc6dc5ab058c43652f47.tar.gz
translated-content-12b585b8e60a2877ff64dc6dc5ab058c43652f47.tar.bz2
translated-content-12b585b8e60a2877ff64dc6dc5ab058c43652f47.zip
unslug de: modify
Diffstat (limited to 'files/de/conflicting/learn')
-rw-r--r--files/de/conflicting/learn/css/building_blocks/values_and_units/index.html3
-rw-r--r--files/de/conflicting/learn/css/first_steps/how_css_works/index.html3
-rw-r--r--files/de/conflicting/learn/css/first_steps/how_css_works_0e31d13696060558e208fc6c734ae400/index.html4
-rw-r--r--files/de/conflicting/learn/css/first_steps/index.html5
-rw-r--r--files/de/conflicting/learn/javascript/objects/index.html3
5 files changed, 12 insertions, 6 deletions
diff --git a/files/de/conflicting/learn/css/building_blocks/values_and_units/index.html b/files/de/conflicting/learn/css/building_blocks/values_and_units/index.html
index be9302eb6e..12f194ed66 100644
--- a/files/de/conflicting/learn/css/building_blocks/values_and_units/index.html
+++ b/files/de/conflicting/learn/css/building_blocks/values_and_units/index.html
@@ -1,8 +1,9 @@
---
title: Color
-slug: Web/Guide/CSS/Getting_started/Farbe
+slug: conflicting/Learn/CSS/Building_blocks/Values_and_units
translation_of: Learn/CSS/Introduction_to_CSS/Values_and_units#Colors
translation_of_original: Web/Guide/CSS/Getting_started/Color
+original_slug: Web/Guide/CSS/Getting_started/Farbe
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/de/conflicting/learn/css/first_steps/how_css_works/index.html b/files/de/conflicting/learn/css/first_steps/how_css_works/index.html
index 01933a9171..a9787ad03f 100644
--- a/files/de/conflicting/learn/css/first_steps/how_css_works/index.html
+++ b/files/de/conflicting/learn/css/first_steps/how_css_works/index.html
@@ -1,8 +1,9 @@
---
title: Why use CSS?
-slug: Web/Guide/CSS/Getting_started/Why_use_CSS
+slug: conflicting/Learn/CSS/First_steps/How_CSS_works
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/Why_use_CSS
+original_slug: Web/Guide/CSS/Getting_started/Why_use_CSS
---
<p><span style="line-height: 1.5;">{{ CSSTutorialTOC() }}</span></p>
diff --git a/files/de/conflicting/learn/css/first_steps/how_css_works_0e31d13696060558e208fc6c734ae400/index.html b/files/de/conflicting/learn/css/first_steps/how_css_works_0e31d13696060558e208fc6c734ae400/index.html
index 8e980ce43c..9a5325863a 100644
--- a/files/de/conflicting/learn/css/first_steps/how_css_works_0e31d13696060558e208fc6c734ae400/index.html
+++ b/files/de/conflicting/learn/css/first_steps/how_css_works_0e31d13696060558e208fc6c734ae400/index.html
@@ -1,8 +1,10 @@
---
title: Wie CSS funktioniert
-slug: Web/Guide/CSS/Getting_started/Wie_CSS_funktioniert
+slug: >-
+ conflicting/Learn/CSS/First_steps/How_CSS_works_0e31d13696060558e208fc6c734ae400
translation_of: Learn/CSS/First_steps/How_CSS_works
translation_of_original: Web/Guide/CSS/Getting_started/How_CSS_works
+original_slug: Web/Guide/CSS/Getting_started/Wie_CSS_funktioniert
---
<p>{{ CSSTutorialTOC() }}</p>
diff --git a/files/de/conflicting/learn/css/first_steps/index.html b/files/de/conflicting/learn/css/first_steps/index.html
index 9472041b96..cd2ed7137a 100644
--- a/files/de/conflicting/learn/css/first_steps/index.html
+++ b/files/de/conflicting/learn/css/first_steps/index.html
@@ -1,11 +1,12 @@
---
title: Einführung
-slug: Web/Guide/CSS/Getting_started
+slug: conflicting/Learn/CSS/First_steps
tags:
- CSS
- - 'CSS:Einführung'
+ - CSS:Einführung
translation_of: Learn/CSS/First_steps
translation_of_original: Web/Guide/CSS/Getting_started
+original_slug: Web/Guide/CSS/Getting_started
---
<h3 id="Einleitung">Einleitung</h3>
<p>Dieser Artikel stellt eine Einführung in Cascading Style Sheets (CSS) dar.</p>
diff --git a/files/de/conflicting/learn/javascript/objects/index.html b/files/de/conflicting/learn/javascript/objects/index.html
index 41d67bc025..d09b4c33bc 100644
--- a/files/de/conflicting/learn/javascript/objects/index.html
+++ b/files/de/conflicting/learn/javascript/objects/index.html
@@ -1,6 +1,6 @@
---
title: Einführung in objektorientiertes JavaScript
-slug: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript
+slug: conflicting/Learn/JavaScript/Objects
tags:
- Constructor
- Encapsulation
@@ -14,6 +14,7 @@ tags:
- Object-Oriented
translation_of: Learn/JavaScript/Objects
translation_of_original: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript
+original_slug: Web/JavaScript/Introduction_to_Object-Oriented_JavaScript
---
<div>{{jsSidebar("Introductory")}}</div>