chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #3106 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2021-12-30 20:31:24 -07:00 committed by GitHub
parent 6657fe6513 59ffa22e08
commit dc603062fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/_lang/zh.json
View File

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

2
public/js/spa.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -24,7 +24,7 @@
"/js/rempos.js": "/js/rempos.js?id=2ef46b249c6390aa4ef8", "/js/rempos.js": "/js/rempos.js?id=2ef46b249c6390aa4ef8",
"/js/rempro.js": "/js/rempro.js?id=3971b84aef886204d286", "/js/rempro.js": "/js/rempro.js?id=3971b84aef886204d286",
"/js/search.js": "/js/search.js?id=dc888b173463dc3894ba", "/js/search.js": "/js/search.js?id=dc888b173463dc3894ba",
"/js/spa.js": "/js/spa.js?id=097495a2ea921a4e2810", "/js/spa.js": "/js/spa.js?id=39db36bb8f6907b9051b",
"/js/status.js": "/js/status.js?id=49fd7ac5b254220021f9", "/js/status.js": "/js/status.js?id=49fd7ac5b254220021f9",
"/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7", "/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
"/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a", "/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",

12
resources/assets/js/i18n/zh.json
View File

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

12
resources/lang/zh/web.php
View File

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