wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-09 11:38:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts on master

Browse Source
This commit is contained in:
Kim Gardner
2018-01-04 16:43:51 -05:00
parent e2534e7ca8
commit bf1fbfe03f
21 changed files with 554 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/talk-plugin-moderation-actions/client/translations.yml
+13 -1
View File
@@ -10,7 +10,7 @@ en:
ban_user_dialog_cancel: "Cancel"
ban_user_dialog_yes: "Yes. Ban user"
ban_user_dialog_headline: "Ban User?"
es:
talk-plugin-moderation-actions:
reject_comment: "Rechazar"
@@ -35,3 +35,15 @@ zh_CN:
ban_user_dialog_cancel: "取消"
ban_user_dialog_yes: "是，确定屏蔽"
ban_user_dialog_headline: "屏蔽用户？"
zh_TW:
talk-plugin-moderation-actions:
reject_comment: "拒絕"
approve_comment: "批准"
approved_comment: "已批准"
moderation_actions: "審核動作"
ban_user: "禁止用戶"
ban_user_dialog_sub: "您確定要禁止該用戶嗎?"
ban_user_dialog_copy: "注意: 禁止該用戶會同時將這條評論加入拒絕隊列。"
ban_user_dialog_cancel: "取消"
ban_user_dialog_yes: "是的。禁止用戶"
ban_user_dialog_headline: "禁止該用戶?"