diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-18 06:17:14 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-18 06:17:14 +0000 |
| commit | eed50514bea3c5a1aa96b0193b26331014bf9e9b (patch) | |
| tree | 6a3c1a4e6b2b4e990c962c30c93121e616aeda9c /config/locales/simple_form.zh-CN.yml | |
| parent | 5a9982b425d3db65d813eb0314a27cea16f0f52d (diff) | |
| parent | 6be72a3ec6d87af4de245b96fea45191ac01114e (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/locales/simple_form.zh-CN.yml')
| -rw-r--r-- | config/locales/simple_form.zh-CN.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index f8c9461ad..23a1f59da 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -50,6 +50,7 @@ zh-CN: interactions: must_be_follower: 屏蔽来自未关注你的用户的通知 must_be_following: 屏蔽来自你未关注的用户的通知 + must_be_following_dm: 屏蔽来自你未关注的用户的私信 notification_emails: digest: 发送摘要邮件 favourite: 当有用户收藏了你的嘟文时，发送电子邮件提醒我 |