3 files changed, 19 insertions, 4 deletions
diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php
index 6ac0bb5e7..fb62c48ef 100644
--- a/app/i18n/zh-cn/conf.php
+++ b/app/i18n/zh-cn/conf.php
@@ -104,7 +104,7 @@ return array(
 			'when' => '将文章设为已读…',
 		),
 		'show' => array(
-			'_' => 	'文章显示',
+			'_' => '文章显示',
 			'adaptive' => '智能显示',
 			'all_articles' => '显示所有文章',
 			'unread' => '只显示未读',
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index a4ef03bc9..a69f02b3f 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -79,6 +79,7 @@ return array(
 		'last_year' => '去年',
 		'mar' => '三月',
 		'march' => '三月',
+		'may_' => '五月',
 		'may' => '五月',
 		'mon' => '周一',
 		'month' => '个月',
@@ -115,13 +116,16 @@ return array(
 	'lang' => array(
 		'cz' => 'Čeština',
 		'de' => 'Deutsch',
-		'en' => 'English1',
+		'en' => 'English',
+		'es' => 'Español',
 		'fr' => 'Français',
-		'it' => 'Italiano1',
+		'it' => 'Italiano',
+		'kr' => '한국어',
 		'nl' => 'Nederlands',
+		'pt-br' => 'Português (Brasil)',
 		'ru' => 'Русский',
 		'tr' => 'Türkçe',
-		'zh-cn' => '简体中文'
+		'zh-cn' => '简体中文',
 	),
 	'menu' => array(
 		'about' => '关于',
diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php
index 0c599e986..159bcd919 100644
--- a/app/i18n/zh-cn/sub.php
+++ b/app/i18n/zh-cn/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(
 		'_' => '分类',
 		'add' => '添加分类',
@@ -39,6 +44,10 @@ return array(
 		'website' => '网站 URL',
 		'pubsubhubbub' => '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' => '导出',
 		'export_opml' => '导出 RSS 源列表 (OPML)',
@@ -54,9 +63,11 @@ return array(
 		'bookmark' => '订阅 (FreshRSS 书签)',
 		'import_export' => '导入/导出',
 		'subscription_management' => '订阅管理',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 	'title' => array(
 		'_' => '订阅管理',
 		'feed_management' => 'RSS 源管理',
+		'subscription_tools' => 'Subscription tools',// TODO
 	),
 );