Update Chinese Translation (#2891)

* Update admin.php

* Update conf.php

* Update feedback.php

已重置

* Update gen.php

* Update sub.php

* Update user.php

* Update user.php

6 files changed, 29 insertions, 29 deletions

diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php
index 6ba32efc5..6905b1547 100644
--- a/app/i18n/zh-cn/admin.php
+++ b/app/i18n/zh-cn/admin.php
@@ -182,7 +182,7 @@ return array(
 		'_' => '更新系统',
 	),
 	'user' => array(
-		'admin' => 'Administrator',	// TODO - Translation
+		'admin' => '管理员',
 		'articles_and_size' => '%s 篇文章（%s)',
 		'article_count' => '文章数',
 		'back_to_manage' => '← 返回用户列表',
@@ -191,7 +191,7 @@ return array(
 		'delete_users' => '删除用户',
 		'email' => '邮箱地址',
 		'feed_count' => '订阅源数',
-		'is_admin' => 'Is admin',	// TODO - Translation
+		'is_admin' => '管理员',
 		'language' => '语言',
 		'list' => '用户列表',
 		'number' => '已有 %d 个用户',
diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php
index 5959765f4..1dcf9c6da 100644
--- a/app/i18n/zh-cn/conf.php
+++ b/app/i18n/zh-cn/conf.php
@@ -97,7 +97,7 @@ return array(
 	),
 	'reading' => array(
 		'after_onread' => '「全部标记为已读」后',
-		'always_show_favorites' => 'Show all articles in favorites by default',	// TODO - Translation
+		'always_show_favorites' => '默认显示收藏夹中所有的文章',
 		'articles_per_page' => '每页文章数',
 		'auto_load_more' => '在页面底部载入下一篇文章',
 		'auto_remove_article' => '阅读后隐藏文章',
@@ -180,7 +180,7 @@ return array(
 		'reading_view' => '切换到阅读视图',
 		'rss_view' => '在新标签中打开 RSS 视图',
 		'see_on_website' => '在原网站中查看',
-		'shift_for_all_read' => '+ <kbd>Alt ⎇</kbd> to mark previous articles as read<br />+ <kbd>⇧ Shift</kbd> 可以将全部文章设为已读',	// TODO - Translation
+		'shift_for_all_read' => '组合 <kbd>Alt ⎇</kbd>键 将上方的文章标记为已读<br />组合 <kbd>⇧ Shift</kbd>按键 可以将全部文章设为已读',
 		'skip_next_article' => '跳转到下一篇文章而不打开',
 		'skip_previous_article' => '跳转到上一篇文章而不打开',
 		'title' => '快捷键',
diff --git a/app/i18n/zh-cn/feedback.php b/app/i18n/zh-cn/feedback.php
index 5cee4fb8f..872f4f819 100644
--- a/app/i18n/zh-cn/feedback.php
+++ b/app/i18n/zh-cn/feedback.php
@@ -84,24 +84,24 @@ return array(
 			'actualizeds' => '已更新订阅源',
 			'added' => '订阅源 <em>%s</em> 已添加',
 			'already_subscribed' => '你已订阅 <em>%s</em>',
-			'cache_cleared' => '<em>%s</em> cache has been cleared',	// TODO - Translation
+			'cache_cleared' => '<em>%s</em> 缓存已清理',
 			'deleted' => '已删除订阅源',
 			'error' => '订阅源更新失败',
 			'internal_problem' => '订阅源添加失败。<a href="%s">检查 FreshRSS 日志</a> 查看详情。你可以在地址链接后附加 <code>#force_feed</code> 从而尝试强制添加。',
 			'invalid_url' => '地址链接 <em>%s</em> 无效',
 			'not_added' => '<em>%s</em> 添加失败',
-			'not_found' => 'Feed cannot be found',	// TODO - Translation
+			'not_found' => '无法找到订阅',
 			'no_refresh' => '没有可刷新的订阅源…',
 			'n_actualized' => '已更新 %d 个订阅源',
 			'n_entries_deleted' => '已删除 %d 篇文章',
 			'over_max' => '你已达到订阅源数上限（%d）',
-			'reloaded' => '<em>%s</em> has been reloaded',	// TODO - Translation
+			'reloaded' => '<em>%s</em> 已重置',
 			'selector_preview' => array(
-				'http_error' => 'Failed to load website content.',	// TODO - Translation
-				'no_entries' => 'There is no entries in your feed. You need at least one entry to create a preview.',	// TODO - Translation
-				'no_feed' => 'Internal error (no feed to entry).',	// TODO - Translation
-				'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.',	// TODO - Translation
-				'selector_empty' => 'The selector is empty. You need to define one to create a preview.',	// TODO - Translation
+				'http_error' => '无法加载网站内容！无法加载网站内容！',
+				'no_entries' => '您的订阅中没有任何条目。您至少需要一个条目来创建一个预览。.',
+				'no_feed' => '内部错误 (no feed to entry).',
+				'no_result' => '选择器没有匹配到任何东西。作为备用，原始的feed文本将被显示出来。',
+				'selector_empty' => '选择器是空的。你需要一个来创建预览。',
 			),
 			'updated' => '已更新订阅源',
 		),
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index 9ae18cfcb..2d9695068 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -7,7 +7,7 @@ return array(
 		'back_to_rss_feeds' => '← 返回订阅源',
 		'cancel' => '取消',
 		'create' => '创建',
-		'demote' => 'Demote',	// TODO - Translation
+		'demote' => '撤销管理员',
 		'disable' => '禁用',
 		'empty' => '清空',
 		'enable' => '启用',
@@ -17,7 +17,7 @@ return array(
 		'manage' => '管理',
 		'mark_favorite' => '标记收藏',
 		'mark_read' => '标记已读',
-		'promote' => 'Promote',	// TODO - Translation
+		'promote' => '设为管理员',
 		'purge' => '清理',
 		'remove' => '删除',
 		'see_website' => '网站中查看',
@@ -73,10 +73,10 @@ return array(
 		'Jun' => '\\六\\月',
 		'jun' => '六月',
 		'june' => '六月',
-		'last_2_year' => 'Last two years',	// TODO - Translation
+		'last_2_year' => '过去两年',
 		'last_3_month' => '最近三个月',
-		'last_3_year' => 'Last three years',	// TODO - Translation
-		'last_5_year' => 'Last five years',	// TODO - Translation
+		'last_3_year' => '过去三年',
+		'last_5_year' => '过去五年',
 		'last_6_month' => '最近六个月',
 		'last_month' => '上月',
 		'last_week' => '上周',
diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php
index 4c9b46b09..6cb4f889e 100644
--- a/app/i18n/zh-cn/sub.php
+++ b/app/i18n/zh-cn/sub.php
@@ -45,11 +45,11 @@ return array(
 		'information' => '信息',
 		'keep_min' => '至少保存的文章数',
 		'maintenance' => array(
-			'clear_cache' => 'Clear cache',	// TODO - Translation
-			'clear_cache_help' => 'Clear the cache of this feed on disk',	// TODO - Translation
-			'reload_articles' => 'Reload articles',	// TODO - Translation
-			'reload_articles_help' => 'Reload articles and fetch complete content',	// TODO - Translation
-			'title' => 'Maintenance',	// TODO - Translation
+			'clear_cache' => '清理缓存',
+			'clear_cache_help' => '清除该feed的缓存',
+			'reload_articles' => '重载文章',
+			'reload_articles_help' => '重新加载文章并获取完整内容',
+			'title' => 'Maintenance',
 		),
 		'moved_category_deleted' => '删除分类时，其中的订阅源会自动归类到 <em>%s</em>',
 		'mute' => '暂停',
@@ -62,8 +62,8 @@ return array(
 			'_' => '可见性',
 		),
 		'selector_preview' => array(
-			'show_raw' => 'Show source',	// TODO - Translation
-			'show_rendered' => 'Show content',	// TODO - Translation
+			'show_raw' => '显示源码',
+			'show_rendered' => '显示内容',
 		),
 		'show' => array(
 			'all' => '显示所有订阅源',
diff --git a/app/i18n/zh-cn/user.php b/app/i18n/zh-cn/user.php
index 552188c88..8dd9bae94 100644
--- a/app/i18n/zh-cn/user.php
+++ b/app/i18n/zh-cn/user.php
@@ -24,13 +24,13 @@ return array(
 	),
 	'mailer' => array(
 		'email_need_validation' => array(
-			'body' => '您刚刚在 ％s 中注册，但仍然需要验证邮箱地址。为此，只需点击链接：',
+			'body' => '%s,欢迎',
 			'title' => '您需要验证您的帐户',
-			'welcome' => '欢迎来到 %s,',
+			'welcome' => '您已注册 %s 现在只需点击下方链接通过邮箱验证即可完成注册:',
 		),
 	),
 	'password' => array(
-		'invalid' => 'The password is invalid.',	// TODO - Translation
+		'invalid' => '无效密码',
 	),
 	'tos' => array(
 		'feedback' => array(
@@ -38,7 +38,7 @@ return array(
 		),
 	),
 	'username' => array(
-		'invalid' => 'The username is invalid.',	// TODO - Translation
-		'taken' => 'The username %s is taken.',	// TODO - Translation
+		'invalid' => '无效用户名',
+		'taken' => '已存在此用户名',
 	),
 );