diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-09 11:40:14 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-04-09 11:45:08 +0200 |
| commit | ce12934f5b1804cc144014d9d0a93fdd16d13bf1 (patch) | |
| tree | e6cb0c166392c28b38d86abe8f27344ce1d7752f /config/locales/devise.zh-CN.yml | |
| parent | ff168ef2024626f37fa776fde5739dcd58ecb9f2 (diff) | |
| parent | 99e3e152cd2180cfa9a5bcafae208d44f31078f8 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.
Diffstat (limited to 'config/locales/devise.zh-CN.yml')
| -rw-r--r-- | config/locales/devise.zh-CN.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml index 4a47dddec..d21c0c7f1 100644 --- a/config/locales/devise.zh-CN.yml +++ b/config/locales/devise.zh-CN.yml @@ -96,9 +96,9 @@ zh-CN: update_needs_confirmation: 账号信息更新成功，但我们需要验证你的新电子邮件地址，请点击邮件中的链接以确认。如果没有收到邮件，请检查你的垃圾邮箱。 updated: 账户资料更新成功。 sessions: - already_signed_out: 已成功登出。 + already_signed_out: 已成功退出登录。 signed_in: 已成功登录。 - signed_out: 已成功登出。 + signed_out: 已成功退出登录。 unlocks: send_instructions: 几分钟后，你将收到一封解锁账户的邮件。如果没有，请检查你的垃圾邮箱。 send_paranoid_instructions: 如果你的账号存在，你将会在几分钟内收到一封指引你如何解锁账号的邮件。如果你没有收到这封邮件，请检查你邮箱的垃圾箱。 |