From 00197d131d645ad6f1cc44fc9e70bb529dbce06a Mon Sep 17 00:00:00 2001
From: kthorri <kristinnt14@ru.is>
Date: Mon, 23 Jan 2017 14:51:59 +0000
Subject: [PATCH 1/5] Adding Icelandic translation to translation.js

---
 translations/translations.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/translations/translations.js b/translations/translations.js
index d572c803..51b90e62 100644
--- a/translations/translations.js
+++ b/translations/translations.js
@@ -19,11 +19,12 @@ var translations = {
 	"pt_br" : "translations/pt_br.json", // Português Brasileiro
 	"sv" : "translations/sv.json", // Svenska
 	"it" : "translations/it.json", // Italian
-	"zh_cn" : "translations/zh_cn.json", // Simplified Chinese
+	"zh_cn" : "translations/zh_cn.jsona", // Simplified Chinese
 	"zh_tw" : "translations/zh_tw.json", // Traditional Chinese
 	"ja" : "translations/ja.json", // Japanese
 	"pl" : "translations/pl.json", // Polish
 	"gr" : "translations/gr.json",  // Greek
 	"da" : "translations/da.json", // Danish
 	"tr" : "translations/tr.json", // Turkish
+	"is" : "translations/is.json", // Icelandic
 };

From 9a983e7565ec18e6dfecddcfac9494eb294d1542 Mon Sep 17 00:00:00 2001
From: kthorri <kristinnt14@ru.is>
Date: Mon, 23 Jan 2017 14:53:18 +0000
Subject: [PATCH 2/5] Adding icelandic translation json file

---
 translations/is.json | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 translations/is.json

diff --git a/translations/is.json b/translations/is.json
new file mode 100644
index 00000000..d3e6d6cb
--- /dev/null
+++ b/translations/is.json
@@ -0,0 +1,34 @@
+{
+	/* GENERAL */
+	"LOADING": "Hleð upp &hellip;",
+
+	/* CALENDAR */
+	"TODAY": "Í dag",
+	"TOMORROW": "Á morgun",
+	"DAYAFTERTOMORROW": "Ekki á morgun, heldur hinn",
+	"RUNNING": "Endar eftir",
+	"EMPTY": "Ekkert framundan.",
+
+	/* WEATHER */
+	"N": "N",
+	"NNE": "NNA",
+	"NE": "NA",
+	"ENE": "ANA",
+	"E": "A",
+	"ESE": "ASA",
+	"SE": "SA",
+	"SSE": "SSA",
+	"S": "S",
+	"SSW": "SSV",
+	"SW": "SV",
+	"WSW": "VSV",
+	"W": "V",
+	"WNW": "VNV",
+	"NW": "NV",
+	"NNW": "NNV",
+
+	/* UPDATE INFO */
+	"UPDATE_NOTIFICATION": "MagicMirror² uppfærsla í boði.",
+	"UPDATE_NOTIFICATION_MODULE": "Uppfærsla í boði fyrir MODULE_NAME module.",
+	"UPDATE_INFO": "Núverandi kerfi er COMMIT_COUNT á eftir BRANCH_NAME branchinu."
+}

From 5e860b685069822afe674da7d19751dc21725940 Mon Sep 17 00:00:00 2001
From: kthorri <kristinnt14@ru.is>
Date: Mon, 23 Jan 2017 14:53:57 +0000
Subject: [PATCH 3/5] Added icelandic translation to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9551b79..ad182002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
 
 ### Added
+- Icelandic translation.
 - Finnish translation.
 - Danish translation.
 - Turkish translation.

From 47a87a14f5475f547bcba571beb9b583ccb3da92 Mon Sep 17 00:00:00 2001
From: kthorri <kristinnt14@ru.is>
Date: Mon, 23 Jan 2017 14:55:24 +0000
Subject: [PATCH 4/5] Fixing typo

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

diff --git a/translations/translations.js b/translations/translations.js
index 51b90e62..c3e15bca 100644
--- a/translations/translations.js
+++ b/translations/translations.js
@@ -19,7 +19,7 @@ var translations = {
 	"pt_br" : "translations/pt_br.json", // Português Brasileiro
 	"sv" : "translations/sv.json", // Svenska
 	"it" : "translations/it.json", // Italian
-	"zh_cn" : "translations/zh_cn.jsona", // Simplified Chinese
+	"zh_cn" : "translations/zh_cn.json", // Simplified Chinese
 	"zh_tw" : "translations/zh_tw.json", // Traditional Chinese
 	"ja" : "translations/ja.json", // Japanese
 	"pl" : "translations/pl.json", // Polish

From d9c7ee8976b69c8306ab133e20dc4c7d47ed1afc Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Mon, 23 Jan 2017 16:18:42 +0100
Subject: [PATCH 5/5] Fixed Changelog to match the correct version.

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe43a1df..d845fec7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Init tests using mocha.
 - Option to use RegExp in Calendar's titleReplace.
 - Hungarian Translation.
+- Icelandic Translation.
 
 ### Fixed
 - Update .gitignore to not ignore default modules folder.
@@ -38,7 +39,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
 
 ### Added
-- Icelandic translation.
 - Finnish translation.
 - Danish translation.
 - Turkish translation.