From d09f01db902a4f0f0542d7b3b57ef4fae3de5adb Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Fri, 13 May 2016 22:06:07 +0200 Subject: [PATCH 1/4] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 22aa18a1..1ac9aaa1 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,9 @@ +> Please send your PR's the develop branch. +> Don't forget to add the change to changelog.md. + * Does the pull request solve a **related** issue? [yes | no] * If so, can you reference the issue? * What does the pull request accomplish? (please list) -* If it has major visual changes please add screenshots. +* If it includes major visual changes please add screenshots. + -DON'T FORGET TO ADD THE CHANGE TO CHANGELOG.md! From 2b82c8fdc9bc9737cfd89ac4746e4f4d7b9cf878 Mon Sep 17 00:00:00 2001 From: RemiHansen Date: Thu, 19 May 2016 23:26:56 +0200 Subject: [PATCH 2/4] Norwegian translation for MM2 --- translations/no.json | 27 +++++++++++++++++++++++++++ translations/translations.js | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 translations/no.json diff --git a/translations/no.json b/translations/no.json new file mode 100644 index 00000000..bc12f3c6 --- /dev/null +++ b/translations/no.json @@ -0,0 +1,27 @@ +{ + /* GENERAL */ + "LOADING": "Laster …", + + /* CALENDAR */ + "TODAY": "Idag", + "TOMORROW": "I morgen", + "RUNNING": "Slutter om", + "EMPTY": "Ingen kommende arrangementer.", + + /* WEATHER */ + "N": "N", + "NNE": "NNØ", + "ENE": "ØNØ", + "E": "Ø", + "ESE": "ØSØ", + "SE": "SØ", + "SSE": "SSØ", + "S": "S", + "SSW": "SSV", + "SW": "SV", + "WSW": "VSV", + "W": "V", + "WNW": "VNV", + "NW": "NV", + "NNW": "NNV" +} diff --git a/translations/translations.js b/translations/translations.js index 25ad77d5..e5ee28af 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -12,5 +12,5 @@ var translations = { "fr" : "translations/fr.json", "fy" : "translations/fy.json", "es" : "translations/es.json", - "it" : "translations/it.json", + "no" : "translations/no.json", }; From 02bbbe668b9bb44c45d0aa6fceaa118085785c9b Mon Sep 17 00:00:00 2001 From: RemiHansen Date: Thu, 19 May 2016 23:37:32 +0200 Subject: [PATCH 3/4] Changelog updated --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 311f2356..c2d7adcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [2.0.1] - 2016-05-19 +### Added +- Norwegian Translation + ## [2.0.1] - 2016-05-18 ### Added - Changelog From 3df4062a5505f124eb05f574c871174f51962b03 Mon Sep 17 00:00:00 2001 From: RemiHansen Date: Fri, 20 May 2016 01:22:45 +0200 Subject: [PATCH 4/4] Norwegian translation (nb and nn) --- CHANGELOG.md | 4 ++-- translations/{no.json => nb.json} | 2 +- translations/nn.json | 27 +++++++++++++++++++++++++++ translations/translations.js | 3 ++- 4 files changed, 32 insertions(+), 4 deletions(-) rename translations/{no.json => nb.json} (95%) create mode 100644 translations/nn.json diff --git a/CHANGELOG.md b/CHANGELOG.md index c2d7adcd..3a302fda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,9 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [2.0.1] - 2016-05-19 +## [2.0.2] - 2016-05-20 ### Added -- Norwegian Translation +- Norwegian Translations (nb and nn) ## [2.0.1] - 2016-05-18 ### Added diff --git a/translations/no.json b/translations/nb.json similarity index 95% rename from translations/no.json rename to translations/nb.json index bc12f3c6..f551ff97 100644 --- a/translations/no.json +++ b/translations/nb.json @@ -3,7 +3,7 @@ "LOADING": "Laster …", /* CALENDAR */ - "TODAY": "Idag", + "TODAY": "I dag", "TOMORROW": "I morgen", "RUNNING": "Slutter om", "EMPTY": "Ingen kommende arrangementer.", diff --git a/translations/nn.json b/translations/nn.json new file mode 100644 index 00000000..7b8fb2ab --- /dev/null +++ b/translations/nn.json @@ -0,0 +1,27 @@ +{ + /* GENERAL */ + "LOADING": "Lastar …", + + /* CALENDAR */ + "TODAY": "I dag", + "TOMORROW": "I morgon", + "RUNNING": "Sluttar om", + "EMPTY": "Ingen komande hendingar.", + + /* WEATHER */ + "N": "N", + "NNE": "NNA", + "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" +} diff --git a/translations/translations.js b/translations/translations.js index e5ee28af..bc6e6aa2 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -12,5 +12,6 @@ var translations = { "fr" : "translations/fr.json", "fy" : "translations/fy.json", "es" : "translations/es.json", - "no" : "translations/no.json", + "nb" : "translations/nb.json", + "nn" : "translations/nn.json", };