Merge pull request #1651 from FreshRSS/dev1.8.0

Release 1.8.0

3 files changed, 19 insertions, 3 deletions

diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php
index 77f6307ed..e4db5ec3d 100644
--- a/app/i18n/nl/conf.php
+++ b/app/i18n/nl/conf.php
@@ -104,7 +104,7 @@ return array(
 			'when' => 'Markeer artikel als gelezen…',
 		),
 		'show' => array(
-			'_' => 	'Artikelen om te tonen',
+			'_' => 'Artikelen om te tonen',
 			'adaptive' => 'Pas weergave aan',
 			'all_articles' => 'Bekijk alle artikelen',
 			'unread' => 'Bekijk alleen ongelezen',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 07d444ec3..1617936ab 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -77,8 +77,9 @@ return array(
 		'last_month' => 'Vorige maand',
 		'last_week' => 'Vorige week',
 		'last_year' => 'Vorig jaar',
-		'mar' => 'mar',
-		'march' => 'Mar',
+		'mar' => 'mrt',
+		'march' => 'Mrt',
+		'may_' => 'Mei',
 		'may' => 'Mei',
 		'mon' => 'Ma',
 		'month' => 'maanden',
@@ -116,11 +117,15 @@ return array(
 		'cz' => 'Čeština',
 		'de' => 'Deutsch',
 		'en' => 'English',
+		'es' => 'Español',
 		'fr' => 'Français',
 		'it' => 'Italiano',
+		'kr' => '한국어',
 		'nl' => 'Nederlands',
+		'pt-br' => 'Português (Brasil)',
 		'ru' => 'Русский',
 		'tr' => 'Türkçe',
+		'zh-cn' => '简体中文',
 	),
 	'menu' => array(
 		'about' => 'Over',
diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php
index e0cebbb4e..bfa0911b7 100644
--- a/app/i18n/nl/sub.php
+++ b/app/i18n/nl/sub.php
@@ -1,6 +1,11 @@
 <?php
 /* Dutch translation by Wanabo. http://www.nieuwskop.be */
 return array(
+	'bookmarklet' => array(
+		'documentation' => 'Drag this button to your bookmarks toolbar or right-click it and choose "Bookmark This Link". Then click "Subscribe" button in any page you want to subscribe to.',// TODO
+		'label' => 'Subscribe',// TODO
+		'title' => 'Bookmarklet',// TODO
+	),
 	'category' => array(
 		'_' => 'Categorie',
 		'add' => 'Voeg categorie toe',
@@ -39,6 +44,10 @@ return array(
 		'validator' => 'Controleer de geldigheid van de feed',
 		'website' => 'Website URL',
 	),
+	'firefox' => array(
+		'documentation' => 'Follow the steps described <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">here</a> to add FreshRSS to Firefox feed reader list.',// TODO
+		'title' => 'Firefox feed reader',// TODO
+	),
 	'import_export' => array(
 		'export' => 'Exporteer',
 		'export_opml' => 'Exporteer lijst van feeds (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => 'Abonneer (FreshRSS bladwijzer)',
 		'import_export' => 'Importeer / exporteer',
 		'subscription_management' => 'Abonnementenbeheer',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 	'title' => array(
 		'_' => 'Abonnementenbeheer',
 		'feed_management' => 'RSS-feedbeheer',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 );