diff options
author | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-07 22:43:52 +0200 |
---|---|---|
committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-07 22:43:52 +0200 |
commit | 7a1ca8b0df9d82a1e6ac4943a2d5562f93eab69f (patch) | |
tree | 36fbf6f3d2019cc345d33fe555569ec750a66957 /config/locales/zh-CN.yml | |
parent | b8791ae79be7a9b7c0e541928b2741e40bbdc8a5 (diff) | |
parent | a3e53bd442752f210db2025f2dfc45e7599354c2 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/locales/zh-CN.yml')
-rw-r--r-- | config/locales/zh-CN.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 5018b48b8..0672202a2 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -176,7 +176,6 @@ zh-CN: authorize_follow: error: 对不起,寻找这个跨站用户时出错 follow: 关注 - prompt_html: 你 (<strong>%{self}</strong>) 正准备关注︰ title: 关注 %{acct} datetime: distance_in_words: |