Update zh-cn Translation (#3473)

8 files changed, 59 insertions, 58 deletions

diff --git a/CREDITS.md b/CREDITS.md
index dff60cd49..75d385792 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -82,6 +82,7 @@ People are sorted by name so please keep this order.
 * [Melvyn Laïly](https://github.com/yaurthek): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=yaurthek), [Web](http://x2a.yt/)
 * [Mike Vanbuskirk](https://github.com/codevbus): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:codevbus) [Web](http://mikevanbuskirk.io/)
 * [MSZ](https://github.com/mszkb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=mszkb)
+* [Myuki](https://github.com/Myuki): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Myuki)
 * [Nick Cross](https://github.com/rnc): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:rnc)
 * [Nico B](https://github.com/youknow0): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:youknow0)
 * [Nicola Spanti](https://github.com/RyDroid): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:RyDroid), [Web](http://www.nicola-spanti.info/)
diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php
index 48572ee6d..737c968de 100644
--- a/app/i18n/zh-cn/admin.php
+++ b/app/i18n/zh-cn/admin.php
@@ -172,7 +172,7 @@ return array(
 		'_' => '更新系统',
 		'apply' => '应用',
 		'check' => '检查更新',
-		'current_version' => '当前 FreshRSS 版本为 %s.',
+		'current_version' => '当前 FreshRSS 版本为 %s。',
 		'last' => '上一次检查：%s',
 		'none' => '没有可用更新',
 		'title' => '更新系统',
@@ -186,11 +186,11 @@ return array(
 		'database_size' => '数据库大小',
 		'delete_users' => '删除用户',
 		'email' => '邮箱地址',
-		'enabled' => 'Enabled',	// TODO - Translation
+		'enabled' => '已启用',
 		'feed_count' => '订阅源数',
 		'is_admin' => '管理员',
 		'language' => '语言',
-		'last_user_activity' => 'Last user activity',	// TODO - Translation
+		'last_user_activity' => '上次用户活跃',
 		'list' => '用户列表',
 		'number' => '已有 %d 个用户',
 		'numbers' => '已有 %d 个用户',
diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php
index 4715080b3..c121a57cf 100644
--- a/app/i18n/zh-cn/conf.php
+++ b/app/i18n/zh-cn/conf.php
@@ -67,20 +67,20 @@ return array(
 		'display' => '显示查询结果',
 		'filter' => array(
 			'_' => '生效的过滤器：',
-			'categories' => 'Display by category',	// TODO - Translation
-			'feeds' => 'Display by feed',	// TODO - Translation
-			'order' => 'Sort by date',	// TODO - Translation
-			'search' => 'Expression',	// TODO - Translation
-			'state' => 'State',	// TODO - Translation
-			'tags' => 'Display by tag',	// TODO - Translation
-			'type' => 'Type',	// TODO - Translation
+			'categories' => '按分类显示',
+			'feeds' => '按订阅源显示',
+			'order' => '按日期排序',
+			'search' => '表达式',
+			'state' => '状态',
+			'tags' => '按标签显示',
+			'type' => '类型',
 		),
 		'get_all' => '显示所有文章',
 		'get_category' => '显示分类 "%s"',
 		'get_favorite' => '显示收藏文章',
 		'get_feed' => '显示订阅源 "%s"',
-		'get_tag' => 'Display "%s" label',	// TODO - Translation
-		'name' => 'Name',	// TODO - Translation
+		'get_tag' => '显示标签 "%s"',
+		'name' => '名称',
 		'no_filter' => '无过滤器',
 		'none' => '你未创建任何自定义查询。',
 		'number' => '查询 n°%d',
@@ -115,7 +115,7 @@ return array(
 		'auto_remove_article' => '阅读后隐藏文章',
 		'confirm_enabled' => '「全部标记为已读」时显示确认对话框',
 		'display_articles_unfolded' => '默认展开显示文章',
-		'display_categories_unfolded' => 'Categories to unfold',	// TODO - Translation
+		'display_categories_unfolded' => '展开的分类',
 		'hide_read_feeds' => '隐藏没有未读文章的分类或订阅源 (启用「显示所有文章」后不生效))',
 		'img_with_lazyload' => '延迟加载图片',
 		'jump_next' => '跳转到下一未读项（订阅源或分类）',
@@ -130,12 +130,12 @@ return array(
 		),
 		'show' => array(
 			'_' => '文章显示',
-			'active_category' => 'Active category',	// TODO - Translation
+			'active_category' => '激活的分类',
 			'adaptive' => '智能显示',
 			'all_articles' => '显示所有',
-			'all_categories' => 'All categories',	// TODO - Translation
-			'no_category' => 'No category',	// TODO - Translation
-			'remember_categories' => 'Remember open categories',	// TODO - Translation
+			'all_categories' => '所有分类',
+			'no_category' => '无分类',
+			'remember_categories' => '记住打开的分类',
 			'unread' => '只显示未读',
 		),
 		'sides_close_article' => '点击文章区域外以关闭',
@@ -200,7 +200,7 @@ return array(
 		'skip_next_article' => '跳转到下一篇文章而不打开',
 		'skip_previous_article' => '跳转到上一篇文章而不打开',
 		'title' => '快捷键',
-		'toggle_media' => 'Play/pause media',	// TODO - Translation
+		'toggle_media' => '播放/暂停媒体',
 		'user_filter' => '显示自定义查询',
 		'user_filter_help' => '如果有多个自定义过滤器，则会按照它们的序号依次访问。',
 		'views' => '视图',
diff --git a/app/i18n/zh-cn/feedback.php b/app/i18n/zh-cn/feedback.php
index 9a7781257..4a4ebdd56 100644
--- a/app/i18n/zh-cn/feedback.php
+++ b/app/i18n/zh-cn/feedback.php
@@ -36,7 +36,7 @@ return array(
 	),
 	'extensions' => array(
 		'already_enabled' => '%s 已启用',
-		'cannot_remove' => '%s cannot be removed',	// TODO - Translation
+		'cannot_remove' => '无法删除 %s',
 		'disable' => array(
 			'ko' => '禁用 %s 失败。<a href="%s">检查 FreshRSS 日志</a> 查看详情。',
 			'ok' => '%s 现已禁用',
@@ -48,7 +48,7 @@ return array(
 		'no_access' => '你无权访问 %s',
 		'not_enabled' => '%s 未启用',
 		'not_found' => '%s 不存在',
-		'removed' => '%s removed',	// TODO - Translation
+		'removed' => '%s 已删除',
 	),
 	'import_export' => array(
 		'export_no_zip_extension' => '服务器未启用 ZIP 扩展。请尝试逐个导出文件。',
@@ -99,9 +99,9 @@ return array(
 			'over_max' => '你已达到订阅源数上限（%d）',
 			'reloaded' => '<em>%s</em> 已重置',
 			'selector_preview' => array(
-				'http_error' => '无法加载网站内容！无法加载网站内容！',
-				'no_entries' => '您的订阅中没有任何条目。您至少需要一个条目来创建一个预览。.',
-				'no_feed' => 'Internal error (feed cannot be found).',	// TODO - Translation
+				'http_error' => '无法加载网站内容。',
+				'no_entries' => '您的订阅中没有任何条目。您至少需要一个条目来创建一个预览。',
+				'no_feed' => '网络错误（订阅源不存在）',
 				'no_result' => '选择器没有匹配到任何东西。作为备用，原始的feed文本将被显示出来。',
 				'selector_empty' => '选择器是空的。你需要一个来创建预览。',
 			),
@@ -110,12 +110,12 @@ return array(
 		'purge_completed' => '清除完成（已删除 %d 篇文章）',
 	),
 	'tag' => array(
-		'created' => 'Tag "%s" has been created.',	// TODO - Translation
-		'name_exists' => 'Tag name already exists.',	// TODO - Translation
-		'renamed' => 'Tag "%s" has been renamed to "%s".',	// TODO - Translation
+		'created' => '标签 "%s" 已创建。',
+		'name_exists' => '标签名已存在。',
+		'renamed' => '标签 "%s" 已被重命名为 "%s"。',
 	),
 	'update' => array(
-		'can_apply' => 'FreshRSS 将更新到 <strong>版本 %s</strong>.',
+		'can_apply' => 'FreshRSS 将更新到 <strong>版本 %s</strong>。',
 		'error' => '更新出错：%s',
 		'file_is_nok' => '请检查 <em>%s</em> 目录权限。HTTP 服务器必须有其写入权限。',
 		'finished' => '更新完成！',
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index 05c807989..4cfb86968 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -3,7 +3,7 @@
 return array(
 	'action' => array(
 		'actualize' => '获取',
-		'add' => 'Add',	// TODO - Translation
+		'add' => '添加',
 		'back' => '← 返回',
 		'back_to_rss_feeds' => '← 返回订阅源',
 		'cancel' => '取消',
@@ -15,14 +15,14 @@ return array(
 		'export' => '导出',
 		'filter' => '过滤',
 		'import' => '导入',
-		'load_default_shortcuts' => 'Load default shortcuts',	// TODO - Translation
+		'load_default_shortcuts' => '重置快捷键',
 		'manage' => '管理',
 		'mark_favorite' => '标记收藏',
 		'mark_read' => '标记已读',
 		'promote' => '设为管理员',
 		'purge' => '清理',
 		'remove' => '删除',
-		'rename' => 'Rename',	// TODO - Translation
+		'rename' => '重命名',
 		'see_website' => '网站中查看',
 		'submit' => '提交',
 		'truncate' => '删除所有文章',
@@ -185,7 +185,7 @@ return array(
 	'share' => array(
 		'Known' => '基于 Known 的站点',
 		'blogotext' => 'Blogotext',
-		'clipboard' => 'Clipboard',	// TODO - Translation
+		'clipboard' => '剪贴板',
 		'diaspora' => 'Diaspora*',
 		'email' => '邮箱',
 		'facebook' => '脸书',
diff --git a/app/i18n/zh-cn/index.php b/app/i18n/zh-cn/index.php
index e8dca30cc..5be230aa8 100644
--- a/app/i18n/zh-cn/index.php
+++ b/app/i18n/zh-cn/index.php
@@ -33,7 +33,7 @@ return array(
 		'about' => '关于 FreshRSS',
 		'before_one_day' => '一天前',
 		'before_one_week' => '一周前',
-		'bookmark_query' => 'Bookmark current query',	// TODO - Translation
+		'bookmark_query' => '收藏当前查询',
 		'favorites' => '收藏（%s）',
 		'global_view' => '全屏视图',
 		'main_stream' => '首页',
diff --git a/app/i18n/zh-cn/install.php b/app/i18n/zh-cn/install.php
index e61ccadb7..ff2a57618 100644
--- a/app/i18n/zh-cn/install.php
+++ b/app/i18n/zh-cn/install.php
@@ -82,9 +82,9 @@ return array(
 		),
 		'tmp' => array(
 			'nok' => '请检查 <em>%s</em> 目录权限。HTTP 服务器必须有其写入权限。',
-			'ok' => 'Permissions on the temp directory are good.',	// TODO - Translation
+			'ok' => '缓存目录权限正常。',
 		),
-		'unknown_process_username' => 'unknown',	// TODO - Translation
+		'unknown_process_username' => '未知',
 		'users' => array(
 			'nok' => '请检查 <em>%s</em> 目录权限。HTTP 服务器必须有其写入权限。',
 			'ok' => 'users 目录权限正常',
@@ -111,10 +111,10 @@ return array(
 		'choose' => '为 FreshRSS 选择语言',
 		'defined' => '语言已指定',
 	),
-	'not_deleted' => '出错！你必须手动删除文件 <em>%s</em>',
+	'not_deleted' => '出现错误，你必须手动删除文件 <em>%s</em>',
 	'ok' => '安装成功',
 	'session' => array(
-		'nok' => 'The web server seems to be incorrectly configured for cookies required for PHP sessions!',	// TODO - Translation
+		'nok' => 'Web 服务器似乎未正确配置 PHP 会话所需的 cookie！',
 	),
 	'step' => '步骤 %d',
 	'steps' => '步骤',
diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php
index 29160bf88..248b5b188 100644
--- a/app/i18n/zh-cn/sub.php
+++ b/app/i18n/zh-cn/sub.php
@@ -1,7 +1,7 @@
 <?php
 
 return array(
-	'add' => 'Feed and category creation has been moved <a href=\'%s\'>here</a>. It is also accessible from the menu on the left and from the ✚ icon available on the main page.',	// TODO - Translation
+	'add' => '订阅源和分类的创建已被移至 <a href=\'%s\'>here</a>。 也可从左侧菜单或主页的 ✚ 图标访问。',
 	'api' => array(
 		'documentation' => '复制以下地址，以供外部工具使用',
 		'title' => 'API',
@@ -34,13 +34,13 @@ return array(
 		),
 		'clear_cache' => '总是清除缓存',
 		'content_action' => array(
-			'_' => 'Content action when fetching the article content',	// TODO - Translation
-			'append' => 'Add after existing content',	// TODO - Translation
-			'prepend' => 'Add before existing content',	// TODO - Translation
-			'replace' => 'Replace existing content',	// TODO - Translation
+			'_' => '获取原文后的操作',
+			'append' => '添加在现有内容后部',
+			'prepend' => '添加在现有内容前部',
+			'replace' => '替换现有内容',
 		),
-		'css_cookie' => 'Use Cookies when fetching the article content',	// TODO - Translation
-		'css_cookie_help' => 'Example: <kbd>foo=bar; gdpr_consent=true; cookie=value</kbd>',	// TODO - Translation
+		'css_cookie' => '获取原文时的 Cookies',
+		'css_cookie_help' => '例：<kbd>foo=bar; gdpr_consent=true; cookie=value</kbd>',
 		'css_help' => '用于获取全文（注意，这将耗费更多时间！）',
 		'css_path' => '原文的 CSS 选择器',
 		'description' => '描述',
@@ -57,7 +57,7 @@ return array(
 			'clear_cache_help' => '清除该feed的缓存',
 			'reload_articles' => '重载文章',
 			'reload_articles_help' => '重新加载文章并获取完整内容',
-			'title' => 'Maintenance',	// TODO - Translation
+			'title' => '维护',
 		),
 		'moved_category_deleted' => '删除分类时，其中的订阅源会自动归类到 <em>%s</em>',
 		'mute' => '暂停',
@@ -69,8 +69,8 @@ return array(
 			'main_stream' => '在首页中显示',
 			'normal' => '在分类中显示',
 		),
-		'proxy' => 'Set a proxy for fetching this feed',	// TODO - Translation
-		'proxy_help' => 'Select a protocol (e.g: SOCKS5) and enter the proxy address (e.g: <kbd>127.0.0.1:1080</kbd>)',	// TODO - Translation
+		'proxy' => '获取原文时的代理',
+		'proxy_help' => '选择协议（例：SOCKS5）和代理地址（例：<kbd>127.0.0.1:1080</kbd>）',
 		'selector_preview' => array(
 			'show_raw' => '显示源码',
 			'show_rendered' => '显示内容',
@@ -112,28 +112,28 @@ return array(
 		'title' => '导入/导出',
 	),
 	'menu' => array(
-		'add' => 'Add a feed or category',	// TODO - Translation
-		'add_feed' => 'Add a feed',	// TODO - Translation
+		'add' => '添加订阅源或分类',
+		'add_feed' => '添加订阅源',
 		'bookmark' => '订阅（FreshRSS 书签）',
 		'import_export' => '导入/导出',
-		'label_management' => 'Label management',	// TODO - Translation
+		'label_management' => '标签管理',
 		'subscription_management' => '订阅管理',
 		'subscription_tools' => '订阅工具',
 	),
 	'tag' => array(
-		'name' => 'Name',	// TODO - Translation
-		'new_name' => 'New name',	// TODO - Translation
-		'old_name' => 'Old name',	// TODO - Translation
+		'name' => '名称',
+		'new_name' => '新名称',
+		'old_name' => '旧名称',
 	),
 	'title' => array(
 		'_' => '订阅管理',
-		'add' => 'Add a feed or category',	// TODO - Translation
-		'add_category' => 'Add a category',	// TODO - Translation
-		'add_feed' => 'Add a feed',	// TODO - Translation
-		'add_label' => 'Add a label',	// TODO - Translation
-		'delete_label' => 'Delete a label',	// TODO - Translation
+		'add' => '添加订阅源或分类',
+		'add_category' => '添加分类',
+		'add_feed' => '添加订阅源',
+		'add_label' => '添加标签',
+		'delete_label' => '删除标签',
 		'feed_management' => '订阅源管理',
-		'rename_label' => 'Rename a label',	// TODO - Translation
+		'rename_label' => '重命名标签',
 		'subscription_tools' => '订阅工具',
 	),
 );