From 42d9e7a09083aaa043a10a10e51ca4ce31063196 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 10 May 2020 15:18:24 +0200 Subject: [PATCH 1/3] Changed "Gevoelstemperatuur" to "Voelt als". This is shorter and saves mirror space. --- translations/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/nl.json b/translations/nl.json index 9a344eb3..1774b16c 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -29,5 +29,5 @@ "UPDATE_INFO_SINGLE": "De huidige installatie loopt {COMMIT_COUNT} commit achter op de {BRANCH_NAME} branch.", "UPDATE_INFO_MULTIPLE": "De huidige installatie loopt {COMMIT_COUNT} commits achter op de {BRANCH_NAME} branch.", - "FEELS": "Gevoelstemperatuur" + "FEELS": "Voelt als" } From 9d249406e38ee5b26092d567addf727353f2c380 Mon Sep 17 00:00:00 2001 From: GeorgeTravelbacon Date: Sun, 10 May 2020 17:07:34 +0200 Subject: [PATCH 2/3] Forgot CHANGELOG.MD --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50ddd64b..fa616f9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,6 +73,7 @@ For more information regarding this major change, please check issue [#1860](htt - Timestamp in log output now also contains the date - Turkish translation. - Option to configure the size of the currentweather module. +- Changed "Gevoelstemperatuur" to "Voelt als" shorter text. ## [2.10.1] - 2020-01-10 From 30e164fe0afb9aa985a668ddc8b5653e69ca915b Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Mon, 21 Sep 2020 12:21:08 +0200 Subject: [PATCH 3/3] Fix merge conflict. --- translations/nl.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/translations/nl.json b/translations/nl.json index 28da61ba..7845ba9e 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -28,11 +28,5 @@ "UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.", "UPDATE_INFO_SINGLE": "De huidige installatie loopt {COMMIT_COUNT} commit achter op de {BRANCH_NAME} branch.", "UPDATE_INFO_MULTIPLE": "De huidige installatie loopt {COMMIT_COUNT} commits achter op de {BRANCH_NAME} branch.", -<<<<<<< HEAD - "FEELS": "Voelt als" -======= - - "FEELS": "Gevoelstemperatuur" ->>>>>>> upstream/develop }