aboutsummaryrefslogtreecommitdiff
path: root/files/ko
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2022-01-18 00:57:02 +0000
committerMDN <actions@users.noreply.github.com>2022-01-18 00:57:02 +0000
commit149b599368b4e27cf7d05f270a43519f599372fd (patch)
tree7e31e2b1434a345cad94b028cdf5d294fa21257b /files/ko
parenta9248e91ff3d691330714a995987a33cb67b9fa8 (diff)
downloadtranslated-content-149b599368b4e27cf7d05f270a43519f599372fd.tar.gz
translated-content-149b599368b4e27cf7d05f270a43519f599372fd.tar.bz2
translated-content-149b599368b4e27cf7d05f270a43519f599372fd.zip
[CRON] sync translated content
Diffstat (limited to 'files/ko')
-rw-r--r--files/ko/_redirects.txt2
-rw-r--r--files/ko/_wikihistory.json20
-rw-r--r--files/ko/conflicting/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/ko/learn/javascript/objects/object-oriented_js/index.html)5
-rw-r--r--files/ko/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/ko/learn/javascript/objects/inheritance/index.html)3
4 files changed, 17 insertions, 13 deletions
diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt
index 05d11bdcbd..8769ccde13 100644
--- a/files/ko/_redirects.txt
+++ b/files/ko/_redirects.txt
@@ -314,6 +314,8 @@
/ko/docs/Learn/HTML/Howto/데이터_속성_사용하기 /ko/docs/Learn/HTML/Howto/Use_data_attributes
/ko/docs/Learn/HTML/Multimedia_and_embedding/ideo_and_audio_content /ko/docs/Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
/ko/docs/Learn/JavaScript/Building_blocks/조건문 /ko/docs/Learn/JavaScript/Building_blocks/conditionals
+/ko/docs/Learn/JavaScript/Objects/Inheritance /ko/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
+/ko/docs/Learn/JavaScript/Objects/Object-oriented_JS /ko/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
/ko/docs/Learn/JavaScript/Objects/얼마나_이해했는지_확인해보자:_JSON /ko/docs/Learn/JavaScript/Objects/Test_your_skills:_JSON
/ko/docs/Learn/Server-side/Express_Nodejs/개발_환경 /ko/docs/Learn/Server-side/Express_Nodejs/development_environment
/ko/docs/Learn/Server-side/Express_Nodejs/스켈레톤_웹사이트 /ko/docs/Learn/Server-side/Express_Nodejs/skeleton_website
diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json
index ddd5aa5b31..b4a8b6a3ff 100644
--- a/files/ko/_wikihistory.json
+++ b/files/ko/_wikihistory.json
@@ -2144,7 +2144,7 @@
"dsma73"
]
},
- "Learn/JavaScript/Objects/Inheritance": {
+ "Learn/JavaScript/Objects/Classes_in_JavaScript": {
"modified": "2020-07-16T22:32:15.138Z",
"contributors": [
"youngdeok",
@@ -2164,15 +2164,6 @@
"ahnzaz"
]
},
- "Learn/JavaScript/Objects/Object-oriented_JS": {
- "modified": "2020-07-16T22:32:06.697Z",
- "contributors": [
- "alattalatta",
- "beowolf9",
- "lunarlit",
- "dsma73"
- ]
- },
"Learn/JavaScript/Objects/Object_prototypes": {
"modified": "2020-07-16T22:32:21.572Z",
"contributors": [
@@ -17476,6 +17467,15 @@
"JaehaAhn"
]
},
+ "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": {
+ "modified": "2020-07-16T22:32:06.697Z",
+ "contributors": [
+ "alattalatta",
+ "beowolf9",
+ "lunarlit",
+ "dsma73"
+ ]
+ },
"conflicting/MDN/Tools": {
"modified": "2019-01-16T20:50:22.654Z",
"contributors": [
diff --git a/files/ko/learn/javascript/objects/object-oriented_js/index.html b/files/ko/conflicting/learn/javascript/objects/classes_in_javascript/index.html
index df1bf59c17..bfee97a562 100644
--- a/files/ko/learn/javascript/objects/object-oriented_js/index.html
+++ b/files/ko/conflicting/learn/javascript/objects/classes_in_javascript/index.html
@@ -1,14 +1,15 @@
---
title: Object-oriented JavaScript for beginners
-slug: Learn/JavaScript/Objects/Object-oriented_JS
+slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
tags:
- Article
- Beginner
- CodingScripting
- JavaScript
- Learn
- - 'l10n:priority'
+ - l10n:priority
translation_of: Learn/JavaScript/Objects/Object-oriented_JS
+original_slug: Learn/JavaScript/Objects/Object-oriented_JS
---
<div>{{LearnSidebar}}</div>
diff --git a/files/ko/learn/javascript/objects/inheritance/index.html b/files/ko/learn/javascript/objects/classes_in_javascript/index.html
index 72a2302d15..0549a416ef 100644
--- a/files/ko/learn/javascript/objects/inheritance/index.html
+++ b/files/ko/learn/javascript/objects/classes_in_javascript/index.html
@@ -1,7 +1,8 @@
---
title: Inheritance in JavaScript
-slug: Learn/JavaScript/Objects/Inheritance
+slug: Learn/JavaScript/Objects/Classes_in_JavaScript
translation_of: Learn/JavaScript/Objects/Inheritance
+original_slug: Learn/JavaScript/Objects/Inheritance
---
<div>{{LearnSidebar}}</div>