From 25c0facfb4db4b97bb0ee51aec80c9330cac4f5d Mon Sep 17 00:00:00 2001
From: "Josep V. Monjo" <jvmonjo@gmail.com>
Date: Sat, 21 Oct 2017 17:28:13 +0200
Subject: [PATCH 1/3] feat: catalan language added

---
 resume/data.yml |  2 +-
 src/lang/ca.js  | 11 +++++++++++
 src/terms.js    |  3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 src/lang/ca.js

diff --git a/resume/data.yml b/resume/data.yml
index a70d388..4e03cd5 100755
--- a/resume/data.yml
+++ b/resume/data.yml
@@ -65,6 +65,6 @@ contact:
   city: New York
   website: johndoe.com
   github: johnyD
-# en, de, fr, pt, cn, it, es, th, pt-br, ru, sv, id, hu, pl, ja, nl, he, zh-tw, lt
+# en, de, fr, pt, ca, cn, it, es, th, pt-br, ru, sv, id, hu, pl, ja, nl, he, zh-tw, lt
 lang: en
 `
diff --git a/src/lang/ca.js b/src/lang/ca.js
new file mode 100644
index 0000000..c428ffb
--- /dev/null
+++ b/src/lang/ca.js
@@ -0,0 +1,11 @@
+/* eslint-disable */
+const ca = {
+  headings: {
+    contact: 'Contacte',
+    experience: 'Experiència',
+    education: 'Educació',
+    skills: 'Habilitats',
+    about: 'Sobre mi'
+  }
+};
+export default ca;
diff --git a/src/terms.js b/src/terms.js
index 6f31a8d..1bc1adf 100755
--- a/src/terms.js
+++ b/src/terms.js
@@ -2,6 +2,7 @@ import en from './lang/en';
 import de from './lang/de';
 import fr from './lang/fr';
 import pt from './lang/pt';
+import ca from '.lang/ca';
 import cn from './lang/cn';
 import it from './lang/it';
 import es from './lang/es';
@@ -20,5 +21,5 @@ import lt from './lang/lt';
 import tr from './lang/tr';
 
 export const terms = {
-  en, de, fr, pt, cn, it, es, th, 'pt-br': ptbr, ru, sv, id, hu, pl, ja, nl, he, 'zh-tw': zhtw, lt, tr
+  en, de, fr, pt, ca, cn, it, es, th, 'pt-br': ptbr, ru, sv, id, hu, pl, ja, nl, he, 'zh-tw': zhtw, lt, tr
 };

From 0573d6036e2c208e133e37a4c7f839757bb40ff0 Mon Sep 17 00:00:00 2001
From: "Josep V. Monjo" <jvmonjo@gmail.com>
Date: Sat, 21 Oct 2017 17:54:45 +0200
Subject: [PATCH 2/3] fix: wrong path

---
 src/terms.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/terms.js b/src/terms.js
index 1bc1adf..b331a31 100755
--- a/src/terms.js
+++ b/src/terms.js
@@ -2,7 +2,7 @@ import en from './lang/en';
 import de from './lang/de';
 import fr from './lang/fr';
 import pt from './lang/pt';
-import ca from '.lang/ca';
+import ca from './lang/ca';
 import cn from './lang/cn';
 import it from './lang/it';
 import es from './lang/es';

From 4ef7f05aa130255c3f33efb36e45548401defc3f Mon Sep 17 00:00:00 2001
From: salomonelli <sara.steiert@outlook.com>
Date: Sat, 21 Oct 2017 19:40:32 +0200
Subject: [PATCH 3/3] MERGE #81 korean lang

---
 resume/data.yml |  2 +-
 src/lang/ko.js  | 11 +++++++++++
 src/terms.js    |  3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 src/lang/ko.js

diff --git a/resume/data.yml b/resume/data.yml
index 4e03cd5..d6ddaff 100755
--- a/resume/data.yml
+++ b/resume/data.yml
@@ -65,6 +65,6 @@ contact:
   city: New York
   website: johndoe.com
   github: johnyD
-# en, de, fr, pt, ca, cn, it, es, th, pt-br, ru, sv, id, hu, pl, ja, nl, he, zh-tw, lt
+# en, de, fr, pt, ca, cn, it, es, th, pt-br, ru, sv, id, hu, pl, ja, nl, he, zh-tw, lt, ko
 lang: en
 `
diff --git a/src/lang/ko.js b/src/lang/ko.js
new file mode 100644
index 0000000..51ec756
--- /dev/null
+++ b/src/lang/ko.js
@@ -0,0 +1,11 @@
+/* eslint-disable */
+const ko = {
+   headings: {
+     contact: "연락처",
+     experience: "경력",
+     education: "학력",
+     skills: "보유스킬",
+     about: "자기소개"
+   }
+ };
+ export default ko;
diff --git a/src/terms.js b/src/terms.js
index b331a31..f276ca1 100755
--- a/src/terms.js
+++ b/src/terms.js
@@ -19,7 +19,8 @@ import zhtw from './lang/zh-tw';
 import nl from './lang/nl';
 import lt from './lang/lt';
 import tr from './lang/tr';
+import ko from './lang/ko';
 
 export const terms = {
-  en, de, fr, pt, ca, cn, it, es, th, 'pt-br': ptbr, ru, sv, id, hu, pl, ja, nl, he, 'zh-tw': zhtw, lt, tr
+  en, de, fr, pt, ca, cn, it, es, th, 'pt-br': ptbr, ru, sv, id, hu, pl, ja, nl, he, 'zh-tw': zhtw, lt, tr, ko
 };