Fix merge conflicts on master

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
@@ -40,3 +40,18 @@ zh_CN:
are_you_sure: "您确定要将这个评论设置为精选评论?"
cancel: "取消"
yes_feature_comment: "确认精选"
zh_TW:
talk-plugin-featured-comments:
un_feature: "取消精選"
feature: "精選"
featured: "精選評論"
featured_comments: "精選評論"
go_to_conversation: "跳轉至對話"
tooltip_description: "我們團隊認為值得一看的評論"
notify_self_featured: '已接受 {0} 的評論,並設為精選評論'
notify_featured: '{0} 接受了評論 "{1}",並將其設為精選評論'
notify_unfeatured: '{0} 將 "{1}" 從精選評論中撤下'
feature_comment: "設置為精選評論?"
are_you_sure: "您確定要將這個評論設置為精選評論?"
cancel: "取消"
yes_feature_comment: "確認精選"