Merge pull request #2186 from FreshRSS/dev1.13.0

FreshRSS 1.13.0

7 files changed, 79 insertions, 63 deletions

diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php
index 1f007f964..e34070526 100644
--- a/app/i18n/zh-cn/admin.php
+++ b/app/i18n/zh-cn/admin.php
@@ -67,8 +67,8 @@ return array(
 			'ok' => '已找到 JSON 扩展',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
 		),
 		'minz' => array(
 			'nok' => '找不到 Minz 框架。',
@@ -106,23 +106,23 @@ return array(
 		),
 	),
 	'extensions' => array(
+		'author' => '作者',
+		'community' => '可用的社区扩展',
+		'description' => '描述',
 		'disabled' => '已禁用',
 		'empty_list' => '没有已安装的扩展',
 		'enabled' => '已启用',
+		'latest' => '已安装',
+		'name' => '名称',
 		'no_configure_view' => '此扩展不能配置。',
 		'system' => array(
 			'_' => '系统扩展',
 			'no_rights' => '系统扩展 (你不能修改它)',
 		),
 		'title' => '扩展',
+		'update' => '更新可用',
 		'user' => '用户扩展',
-		'community' => '可用的社区扩展',
-		'name' => '名称',
 		'version' => '版本',
-		'description' => '描述',
-		'author' => '作者',
-		'latest' => '已安装',
-		'update' => '更新可用',
 	),
 	'stats' => array(
 		'_' => '统计',
@@ -162,6 +162,10 @@ return array(
 		'instance-name' => '实例名称',
 		'max-categories' => '每用户分类限制',
 		'max-feeds' => '每用户 RSS 源限制',
+		'cookie-duration' => array(
+			'help' => 'in seconds', // @todo translate
+			'number' => 'Duration to keep logged in', // @todo translate
+		),
 		'registration' => array(
 			'help' => '0 表示无账户数限制',
 			'number' => '最大账户数',
@@ -179,15 +183,15 @@ return array(
 	'user' => array(
 		'articles_and_size' => '%s 篇文章 (%s)',
 		'create' => '创建新用户',
-		'delete_users' => 'Delete user', // TODO
+		'delete_users' => 'Delete user',	//TODO - Translation
 		'language' => '语言',
 		'number' => '已有 %d 个帐户',
 		'numbers' => '已有 %d 个帐户',
 		'password_form' => '密码<br /><small>(用于 Web-form 登录方式)</small>',
 		'password_format' => '至少 7 个字符',
-		'selected' => 'Selected user', // TODO
+		'selected' => 'Selected user',	//TODO - Translation
 		'title' => '用户管理',
-		'update_users' => 'Update user', // TODO
+		'update_users' => 'Update user',	//TODO - Translation
 		'user_list' => '用户列表',
 		'username' => '用户名',
 		'users' => '用户',
diff --git a/app/i18n/zh-cn/conf.php b/app/i18n/zh-cn/conf.php
index 6c62349c2..1216aaaca 100644
--- a/app/i18n/zh-cn/conf.php
+++ b/app/i18n/zh-cn/conf.php
@@ -19,7 +19,7 @@ return array(
 			'bottom_line' => '底栏',
 			'entry' => '文章图标',
 			'publication_date' => '更新日期',
-			'related_tags' => '相关标签',	//TODO
+			'related_tags' => '相关标签',
 			'sharing' => '分享',
 			'top_line' => '顶栏',
 		),
@@ -28,6 +28,7 @@ return array(
 			'seconds' => '秒 (0 表示不超时)',
 			'timeout' => 'HTML5 通知超时时间',
 		),
+		'show_nav_buttons' => 'Show the navigation buttons',	//TODO - Translation
 		'theme' => '主题',
 		'title' => '显示',
 		'width' => array(
@@ -37,12 +38,22 @@ return array(
 			'no_limit' => '无限制',
 			'thin' => '小',
 		),
-		'show_nav_buttons' => 'Show the navigation buttons',	//TODO
+	),
+	'profile' => array(
+		'_' => '帐户管理',
+		'delete' => array(
+			'_' => '账户删除',
+			'warn' => '你的帐户和所有相关数据都将被删除。',
+		),
+		'password_api' => 'API 密码<br /><small>(例如,用于手机 APP)</small>',
+		'password_form' => '密码<br /><small>(用于 Web-form 登录方式)</small>',
+		'password_format' => '至少 7 个字符',
+		'title' => '用户帐户',
 	),
 	'query' => array(
 		'_' => '自定义查询',
 		'deprecated' => '此查询不再有效。相关的分类或 RSS 源已被删除。',
-		'display' => 'Display user query results', // TODO
+		'display' => 'Display user query results',	//TODO - Translation
 		'filter' => '生效的过滤器：',
 		'get_all' => '显示所有文章',
 		'get_category' => '显示分类 "%s"',
@@ -53,7 +64,7 @@ return array(
 		'number' => '查询 n°%d',
 		'order_asc' => '由旧到新显示文章',
 		'order_desc' => '由新到旧显示文章',
-		'remove' => 'Remove user query', // TODO
+		'remove' => 'Remove user query',	//TODO - Translation
 		'search' => '搜索 "%s"',
 		'state_0' => '显示所有文章',
 		'state_1' => '显示已读文章',
@@ -73,31 +84,19 @@ return array(
 		'state_15' => '显示所有文章',
 		'title' => '自定义查询',
 	),
-	'profile' => array(
-		'_' => '帐户管理',
-		'delete' => array(
-			'_' => '账户删除',
-			'warn' => '你的帐户和所有相关数据都将被删除。',
-		),
-		'password_api' => 'API 密码<br /><small>(例如,用于手机 APP)</small>',
-		'password_form' => '密码<br /><small>(用于 Web-form 登录方式)</small>',
-		'password_format' => '至少 7 个字符',
-		'title' => '用户帐户',
-	),
 	'reading' => array(
 		'_' => '阅读',
 		'after_onread' => '“全部设为已读”后,',
 		'articles_per_page' => '每页文章数',
 		'auto_load_more' => '在页面底部载入下一篇文章',
 		'auto_remove_article' => '阅读后隐藏文章',
-		'mark_updated_article_unread' => '有更新的文章设为未读',
 		'confirm_enabled' => '“全部设为已读”时显示确认对话框',
 		'display_articles_unfolded' => '默认展开文章',
 		'display_categories_unfolded' => '默认展开分类',
 		'hide_read_feeds' => '隐藏没有未读文章的分类或 RSS 源 (启用“显示所有文章”时不生效))',
 		'img_with_lazyload' => '延迟加载图片',
-		'sides_close_article' => '点击文章外区域以关闭文章',
 		'jump_next' => '跳转到下一未读项 (RSS 源或分类)',
+		'mark_updated_article_unread' => '有更新的文章设为未读',
 		'number_divided_when_reader' => '阅读视图中显示一半',
 		'read' => array(
 			'article_open_on_website' => '在打开原文章后',
@@ -112,6 +111,7 @@ return array(
 			'all_articles' => '显示所有文章',
 			'unread' => '只显示未读',
 		),
+		'sides_close_article' => '点击文章外区域以关闭文章',
 		'sort' => array(
 			'_' => '排列顺序',
 			'newer_first' => '由新到旧',
@@ -128,7 +128,7 @@ return array(
 	),
 	'sharing' => array(
 		'_' => '分享',
-		'add' => 'Add a sharing method', // TODO
+		'add' => 'Add a sharing method',	//TODO - Translation
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
@@ -136,7 +136,7 @@ return array(
 		'g+' => 'Google+',
 		'more_information' => '更多信息',
 		'print' => '打印',
-		'remove' => 'Remove sharing method', // TODO
+		'remove' => 'Remove sharing method',	//TODO - Translation
 		'shaarli' => 'Shaarli',
 		'share_name' => '名称',
 		'share_url' => '地址',
@@ -158,10 +158,11 @@ return array(
 		'javascript' => '若要使用快捷键，必须启用 JavaScript',
 		'last_article' => '跳转到最后一篇文章',
 		'load_more' => '载入更多文章',
-		'mark_read' => '设为已读',
 		'mark_favorite' => '加入收藏',
+		'mark_read' => '设为已读',
 		'navigation' => '浏览',
 		'navigation_help' => '搭配 "Shift" 键，浏览快捷键将生效于 RSS 源。<br/>搭配 "Alt" 键，浏览快捷键将生效于分类。',
+		'navigation_no_mod_help' => 'The following navigation shortcuts do not support modifiers.',	//TODO - Translation
 		'next_article' => '跳转到下一篇文章',
 		'normal_view' => '切换到普通视图',
 		'other_action' => '其他操作',
@@ -170,6 +171,8 @@ return array(
 		'rss_view' => '在新标签中打开 RSS 视图',
 		'see_on_website' => '在原网站上查看',
 		'shift_for_all_read' => '+ <code>shift</code> 可以将全部文章设为已读',
+		'skip_next_article' => 'Focus next without opening',	//TODO - Translation
+		'skip_previous_article' => 'Focus previous without opening',	//TODO - Translation
 		'title' => '快捷键',
 		'user_filter' => '显示自定义查询',
 		'user_filter_help' => '如果有多个自定义过滤器，则会按照它们的编号依次访问。',
diff --git a/app/i18n/zh-cn/feedback.php b/app/i18n/zh-cn/feedback.php
index e9f7b4aac..e1778a9f2 100644
--- a/app/i18n/zh-cn/feedback.php
+++ b/app/i18n/zh-cn/feedback.php
@@ -50,11 +50,15 @@ return array(
 		'no_zip_extension' => '服务器未启用 ZIP 扩展。',
 		'zip_error' => '导入 ZIP 文件时出错',
 	),
+	'profile' => array(
+		'error' => '你的帐户修改失败',
+		'updated' => '你的帐户已修改',
+	),
 	'sub' => array(
 		'actualize' => '获取',
 		'articles' => array(
-			'marked_read' => 'The selected articles have been marked as read.',	//TODO
-			'marked_unread' => 'The articles have been marked as unread.',	//TODO
+			'marked_read' => 'The selected articles have been marked as read.',	//TODO - Translation
+			'marked_unread' => 'The articles have been marked as unread.',	//TODO - Translation
 		),
 		'category' => array(
 			'created' => '分类 %s 已创建。',
@@ -76,7 +80,7 @@ return array(
 			'already_subscribed' => '你已订阅 <em>%s</em>',
 			'deleted' => 'RSS 源已删除',
 			'error' => 'RSS 源更新失败',
-			'internal_problem' => 'RSS 源添加失败。<a href="%s">检查 FreshRSS 日志</a> 查看详情。', // @todo
+			'internal_problem' => 'RSS 源添加失败。<a href="%s">检查 FreshRSS 日志</a> 查看详情。',	//TODO - Translation
 			'invalid_url' => 'URL <em>%s</em> 无效',
 			'n_actualized' => '%d 个 RSS 源已更新',
 			'n_entries_deleted' => '%d 篇文章已删除',
@@ -105,12 +109,8 @@ return array(
 			'error' => '用户 %s 删除失败',
 		),
 		'updated' => array(
-			'_' => 'User %s has been updated', // TODO
-			'error' => 'User %s has not been updated', // TODO
+			'_' => 'User %s has been updated',	//TODO - Translation
+			'error' => 'User %s has not been updated',	//TODO - Translation
 		),
 	),
-	'profile' => array(
-		'error' => '你的帐户修改失败',
-		'updated' => '你的帐户已修改',
-	),
 );
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index 078e1d378..1dcd95233 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -19,7 +19,7 @@ return array(
 		'see_website' => '查看网站',
 		'submit' => '提交',
 		'truncate' => '删除所有文章',
-		'update' => 'Update', // TODO
+		'update' => 'Update',	//TODO - Translation
 	),
 	'auth' => array(
 		'email' => 'Email 地址',
@@ -44,33 +44,28 @@ return array(
 	),
 	'date' => array(
 		'Apr' => '\\四\\月',
-		'Aug' => '\\八\\月',
-		'Dec' => '\\十\\二\\月',
-		'Feb' => '\\二\\月',
-		'Jan' => '\\一\\月',
-		'Jul' => '\\七\\月',
-		'Jun' => '\\六\\月',
-		'Mar' => '\\三\\月',
-		'May' => '\\五\\月',
-		'Nov' => '\\十\\一\\月',
-		'Oct' => '\\十\\月',
-		'Sep' => '\\九\\月',
 		'apr' => '四月',
 		'april' => '四月',
+		'Aug' => '\\八\\月',
 		'aug' => '八月',
 		'august' => '八月',
 		'before_yesterday' => '昨天以前',
+		'Dec' => '\\十\\二\\月',
 		'dec' => '十二月',
 		'december' => '十二月',
+		'Feb' => '\\二\\月',
 		'feb' => '二月',
 		'february' => '二月',
 		'format_date' => 'Y\\年n\\月j\\日',
 		'format_date_hour' => 'Y\\年n\\月j\\日  H\\:i',
 		'fri' => '周五',
+		'Jan' => '\\一\\月',
 		'jan' => '一月',
 		'january' => '一月',
+		'Jul' => '\\七\\月',
 		'jul' => '七月',
 		'july' => '七月',
+		'Jun' => '\\六\\月',
 		'jun' => '六月',
 		'june' => '六月',
 		'last_3_month' => '最近三个月',
@@ -78,17 +73,22 @@ return array(
 		'last_month' => '上月',
 		'last_week' => '上周',
 		'last_year' => '去年',
+		'Mar' => '\\三\\月',
 		'mar' => '三月',
 		'march' => '三月',
+		'May' => '\\五\\月',
 		'may' => '五月',
 		'may_' => '五月',
 		'mon' => '周一',
 		'month' => '个月',
+		'Nov' => '\\十\\一\\月',
 		'nov' => '十一月',
 		'november' => '十一月',
+		'Oct' => '\\十\\月',
 		'oct' => '十月',
 		'october' => '十月',
 		'sat' => '周日',
+		'Sep' => '\\九\\月',
 		'sep' => '九月',
 		'september' => '九月',
 		'sun' => '周日',
@@ -124,6 +124,7 @@ return array(
 		'it' => 'Italiano',
 		'kr' => '한국어',
 		'nl' => 'Nederlands',
+		'oc' => 'Occitan',
 		'pt-br' => 'Português (Brasil)',
 		'ru' => 'Русский',
 		'tr' => 'Türkçe',
@@ -160,7 +161,6 @@ return array(
 		'previous' => '上一页',
 	),
 	'share' => array(
-		'Known' => '基于 Known 的站点',
 		'blogotext' => 'Blogotext',
 		'diaspora' => 'Diaspora*',
 		'email' => 'Email',
@@ -168,9 +168,11 @@ return array(
 		'g+' => 'Google+',
 		'gnusocial' => 'GNU social',
 		'jdh' => 'Journal du hacker',
+		'Known' => '基于 Known 的站点',
 		'linkedin' => 'LinkedIn',
 		'mastodon' => 'Mastodon',
 		'movim' => 'Movim',
+		'pinboard' => 'Pinboard',
 		'pocket' => 'Pocket',
 		'print' => '打印',
 		'shaarli' => 'Shaarli',
diff --git a/app/i18n/zh-cn/index.php b/app/i18n/zh-cn/index.php
index dd8eafda7..3f6b44701 100644
--- a/app/i18n/zh-cn/index.php
+++ b/app/i18n/zh-cn/index.php
@@ -40,7 +40,7 @@ return array(
 		'mark_all_read' => '全部设为已读',
 		'mark_cat_read' => '此分类设为已读',
 		'mark_feed_read' => '此源设为已读',
-		'mark_selection_unread' => 'Mark selection as unread',	//TODO
+		'mark_selection_unread' => 'Mark selection as unread',	//TODO - Translation
 		'newer_first' => '由新到旧',
 		'non-starred' => '显示未收藏',
 		'normal_view' => '普通视图',
@@ -53,11 +53,11 @@ return array(
 		'starred' => '显示收藏',
 		'stats' => '统计',
 		'subscription' => '订阅管理',
-		'tags' => 'My labels',	//TODO
+		'tags' => 'My labels',	//TODO - Translation
 		'unread' => '显示未读',
 	),
 	'share' => '分享',
 	'tag' => array(
-		'related' => '相关标签',	//TODO
+		'related' => '相关标签',	//TODO - Translation
 	),
 );
diff --git a/app/i18n/zh-cn/install.php b/app/i18n/zh-cn/install.php
index fe34a44c0..29647932a 100644
--- a/app/i18n/zh-cn/install.php
+++ b/app/i18n/zh-cn/install.php
@@ -24,8 +24,8 @@ return array(
 			'ok' => '数据库配置已保存。',
 		),
 		'host' => '主机',
-		'prefix' => '表前缀',
 		'password' => '密码',
+		'prefix' => '表前缀',
 		'type' => '数据库类型',
 		'username' => '用户名',
 	),
@@ -69,8 +69,8 @@ return array(
 			'ok' => '已找到推荐的 JSON 解析库。',
 		),
 		'mbstring' => array(
-			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO
-			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO
+			'nok' => 'Cannot find the recommended library mbstring for Unicode.',	//TODO - Translation
+			'ok' => 'You have the recommended library mbstring for Unicode.',	//TODO - Translation
 		),
 		'minz' => array(
 			'nok' => '找不到 Minz 框架。',
diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php
index 4980b803a..e1c176bc6 100644
--- a/app/i18n/zh-cn/sub.php
+++ b/app/i18n/zh-cn/sub.php
@@ -27,7 +27,7 @@ return array(
 			'password' => 'HTTP 密码',
 			'username' => 'HTTP 用户名',
 		),
-		'clear_cache' => 'Always clear cache',	//TODO
+		'clear_cache' => 'Always clear cache',	//TODO - Translation
 		'css_help' => '用于获取全文（注意，这将耗费更多时间！）',
 		'css_path' => '原文的 CSS 选择器',
 		'description' => '描述',
@@ -45,17 +45,24 @@ return array(
 			'main_stream' => '在首页中显示',
 			'normal' => '在分类中显示',
 		),
-		'ssl_verify' => 'Verify SSL security',	//TODO
+		'websub' => 'WebSub 即时通知',
+		'show' => array(
+			'all' => 'Show all feeds',	//TODO - Translation
+			'error' => 'Show only feeds with error',	//TODO - Translation
+		),
+		'showing' => array(
+			'error' => 'Showing only feeds with error',	//TODO - Translation
+		),
+		'ssl_verify' => 'Verify SSL security',	//TODO - Translation
 		'stats' => '统计',
 		'think_to_add' => '你可以添加一些 RSS 源。',
-		'timeout' => 'Timeout in seconds',	//TODO
+		'timeout' => 'Timeout in seconds',	//TODO - Translation
 		'title' => '标题',
 		'title_add' => '添加 RSS 源',
 		'ttl' => '最小自动更新时间',
 		'url' => '源 URL',
 		'validator' => '检查 RSS 源有效性',
 		'website' => '网站 URL',
-		'pubsubhubbub' => 'PubSubHubbub 即时通知',
 	),
 	'firefox' => array(
 		'documentation' => '按照 <a href="https://developer.mozilla.org/en-US/Firefox/Releases/2/Adding_feed_readers_to_Firefox#Adding_a_new_feed_reader_manually">这里</a> 描述的步骤可将 FreshRSS 添加到 Firefox 阅读器列表',