diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-06 20:17:13 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-06 20:17:13 +0000 |
| commit | 8ca91cef45417947607079118b1af07c9774ae58 (patch) | |
| tree | cafbe6cc30563ca35ffa522056ead63ca450d9c1 /config/locales/simple_form.zh-CN.yml | |
| parent | f2f2f1032082d6212771bd0307136484f671d37e (diff) | |
| parent | a0047fdca052088cce0e23c3b58b95f13be19805 (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 23a1f59da..b1888f4e3 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -26,10 +26,12 @@ zh-CN: data: 数据文件 display_name: 昵称 email: 电子邮件地址 + expires_in: 失效时间 filtered_languages: 语言过滤 header: 个人资料页横幅图片 locale: 语言 locked: 保护你的帐户（锁嘟） + max_uses: 最大使用次数 new_password: 新密码 note: 简介 otp_attempt: 双重认证代码 |