Merge pull request #1651 from FreshRSS/dev1.8.0

Release 1.8.0

3 files changed, 17 insertions, 1 deletions

diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index bfc24d2d2..ac7c08e98 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -104,7 +104,7 @@ return array(
 			'when' => 'Artikel als gelesen markieren…',
 		),
 		'show' => array(
-			'_' => 	'Artikel zum Anzeigen',
+			'_' => 'Artikel zum Anzeigen',
 			'adaptive' => 'Anzeige anpassen',
 			'all_articles' => 'Alle Artikel zeigen',
 			'unread' => 'Nur ungelesene zeigen',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index 4b171a04d..43d0a2c05 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -79,6 +79,7 @@ return array(
 		'last_year' => 'Letztes Jahr',
 		'mar' => 'Mär',
 		'march' => 'März',
+		'may_' => 'Mai',
 		'may' => 'Mai',
 		'mon' => 'Mo',
 		'month' => 'Monat(en)',
@@ -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' => 'Über',
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index cc98fd25c..c16d09db1 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -1,6 +1,11 @@
 <?php
 
 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(
 		'_' => 'Kategorie',
 		'add' => 'Eine Kategorie hinzufügen',
@@ -39,6 +44,10 @@ return array(
 		'website' => 'Webseiten-URL',
 		'pubsubhubbub' => 'Sofortbenachrichtigung mit PubSubHubbub',
 	),
+	'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' => 'Exportieren',
 		'export_opml' => 'Liste der Feeds exportieren (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => 'Abonnieren (FreshRSS-Lesezeichen)',
 		'import_export' => 'Importieren / Exportieren',
 		'subscription_management' => 'Abonnementverwaltung',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 	'title' => array(
 		'_' => 'Abonnementverwaltung',
 		'feed_management' => 'Verwaltung der RSS-Feeds',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 );