diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-06-12 16:39:30 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-06-12 16:39:30 -0500 |
| commit | e931cf656d1de6d89b5b048d8f1de15be7b52690 (patch) | |
| tree | b1c0c66b6a88b56c422ea8be1dbef77e42afae72 /app/javascript/mastodon/locales/zh-HK.json | |
| parent | 97d2df77aae687c983c1294ebcd3962e4f9d985c (diff) | |
| parent | 34f1fd2a621ca869c17009487e2f10063812fbd0 (diff) | |
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
Conflicts: app/models/glitch/keyword_mute.rb
Diffstat (limited to 'app/javascript/mastodon/locales/zh-HK.json')
| -rw-r--r-- | app/javascript/mastodon/locales/zh-HK.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index 1fea2ced3..578f03842 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -83,6 +83,8 @@ "confirmations.domain_block.message": "你真的真的確定要隱藏整個 {domain} ？多數情況下，比較推薦封鎖或靜音幾個特定目標就好。", "confirmations.mute.confirm": "靜音", "confirmations.mute.message": "你確定要將{name}靜音嗎？", + "confirmations.redraft.confirm": "Delete & redraft", + "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.", "confirmations.unfollow.confirm": "取消關注", "confirmations.unfollow.message": "真的不要繼續關注 {name} 了嗎？", "embed.instructions": "要內嵌此文章，請將以下代碼貼進你的網站。", @@ -264,6 +266,7 @@ "status.reblog": "轉推", "status.reblog_private": "轉推到原讀者", "status.reblogged_by": "{name} 轉推", + "status.redraft": "Delete & re-draft", "status.reply": "回應", "status.replyAll": "回應所有人", "status.report": "舉報 @{name}", @@ -284,8 +287,6 @@ "timeline.media": "Media", "timeline.posts": "文章", "trends.count_by_accounts": "{count} 位用戶在討論", - "trends.header": "現時趨勢", - "trends.refresh": "重新載入", "ui.beforeunload": "如果你現在離開 Mastodon，你的草稿內容將會被丟棄。", "upload_area.title": "將檔案拖放至此上載", "upload_button.label": "上載媒體檔案", |