about summary refs log tree commit diff
path: root/app/javascript/mastodon/locales/zh-CN.json
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-02-12 20:32:48 +0100
committerThibaut Girka <thib@sitedethib.com>2019-02-12 20:32:48 +0100
commit0e34e91661d47ffbb08121c74c8a2de5266de0c8 (patch)
tree949024a721989fb2de04de0412cdbdbd41990e36 /app/javascript/mastodon/locales/zh-CN.json
parenta3ba28eb17d75af37396359e8c37675e06605ccf (diff)
parent2f80a348c9de3de6dbf220f9e12d5906042b3f73 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon/locales/zh-CN.json')
-rw-r--r--app/javascript/mastodon/locales/zh-CN.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index dfa261d6e..0cfa3f712 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -297,6 +297,7 @@
   "status.block": "屏蔽 @{name}",
   "status.cancel_reblog_private": "取消转嘟",
   "status.cannot_reblog": "无法转嘟这条嘟文",
+  "status.copy": "Copy link to status",
   "status.delete": "删除",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "发送私信给 @{name}",
@@ -342,6 +343,7 @@
   "ui.beforeunload": "如果你现在离开 Mastodon,你的草稿内容将会被丢弃。",
   "upload_area.title": "将文件拖放到此处开始上传",
   "upload_button.label": "上传媒体文件",
+  "upload_error.limit": "File upload limit exceeded.",
   "upload_form.description": "为视觉障碍人士添加文字说明",
   "upload_form.focus": "剪裁",
   "upload_form.undo": "取消上传",