diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-02 16:36:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 16:36:21 +0200 |
| commit | e62d574ead8a18050225532619f36423cf017371 (patch) | |
| tree | 68e479f4a983f2166856a4384ed25f366cb1d7c8 /config/locales/simple_form.zh-CN.yml | |
| parent | 665eb1affe7ba765af476e6f00096aad3af70735 (diff) | |
| parent | 1c8eb9bcf7fb3af20b2896a266442f900eab9b63 (diff) | |
Merge pull request #1370 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.zh-CN.yml')
| -rw-r--r-- | config/locales/simple_form.zh-CN.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 040e90ef7..3b581da6e 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -7,7 +7,7 @@ zh-CN: account_migration: acct: 指定你想迁移过去的帐号的 用户名@站点域名 account_warning_preset: - text: 你可以在嘟文中使用特殊格式，例如在嘟文中加入 URL、话题标签和提及“@” + text: 你可以使用嘟文格式，例如加入 URL、话题标签和“@” title: 可选。对接收者不可见 admin_account_action: include_statuses: 用户将会看到哪些嘟文导致了审核行为或警告 @@ -151,6 +151,7 @@ zh-CN: setting_use_blurhash: 将隐藏媒体显示为彩色渐变 setting_use_pending_items: 慢速模式 severity: 级别 + sign_in_token_attempt: 安全码 type: 导入数据类型 username: 用户名 username_or_email: 用户名或电子邮件地址 |