Merge pull request #3106 from pixelfed/staging

Staging

resources/assets/js/i18n/zh.json

@@ -11,11 +11,11 @@
         "shares": "Shares",
         "unshare": "Unshare",
         "cancel": "Cancel",
-        "copyLink": "\u590d\u5236\u94fe\u63a5",
-        "delete": "\u5220\u9664",
-        "error": "\u9519\u8bef",
-        "errorMsg": "\u51fa\u9519\u4e86\u3002\u8bf7\u7a0d\u540e\u518d\u8bd5\u3002",
-        "oops": "\u54ce\u5440\uff01",
+        "copyLink": "Copy Link",
+        "delete": "Delete",
+        "error": "Error",
+        "errorMsg": "Something went wrong. Please try again later.",
+        "oops": "Oops!",
         "other": "Other",
         "readMore": "Read more",
         "success": "Success",
@@ -45,7 +45,7 @@
         "logout": "Logout",
         "about": "About",
         "help": "Help",
-        "language": "\u8bed\u8a00",
+        "language": "Language",
         "privacy": "Privacy",
         "terms": "Terms",
         "backToPreviousDesign": "Go back to previous design"

resources/lang/zh/web.php

@@ -15,11 +15,11 @@ return [
 		'unshare' => 'Unshare',
 
 		'cancel' => 'Cancel',
-		'copyLink' => '复制链接',
-		'delete' => '删除',
-		'error' => '错误',
-		'errorMsg' => '出错了。请稍后再试。',
-		'oops' => '哎呀！',
+		'copyLink' => 'Copy Link',
+		'delete' => 'Delete',
+		'error' => 'Error',
+		'errorMsg' => 'Something went wrong. Please try again later.',
+		'oops' => 'Oops!',
 		'other' => 'Other',
 		'readMore' => 'Read more',
 		'success' => 'Success',
@@ -60,7 +60,7 @@ return [
 		// Nav footer
 		'about' => 'About',
 		'help' => 'Help',
-		'language' => '语言',
+		'language' => 'Language',
 		'privacy' => 'Privacy',
 		'terms' => 'Terms',