Merge pull request #2186 from FreshRSS/dev1.13.0

FreshRSS 1.13.0

1 files changed, 15 insertions, 13 deletions

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',