diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
| commit | 93912f04988eab072a119a588342c68c5cdb52e0 (patch) | |
| tree | 815a69053ed9f1eb5e86e62735220a53bfcef814 /config/locales/activerecord.zh-TW.yml | |
| parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
| parent | d26c1cb2fe145b8d56a9c15e110a917e6f63068b (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.
Diffstat (limited to 'config/locales/activerecord.zh-TW.yml')
| -rw-r--r-- | config/locales/activerecord.zh-TW.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/activerecord.zh-TW.yml b/config/locales/activerecord.zh-TW.yml index 2548bdb23..002ca9519 100644 --- a/config/locales/activerecord.zh-TW.yml +++ b/config/locales/activerecord.zh-TW.yml @@ -7,7 +7,7 @@ zh-TW: options: 選擇 user: agreement: 服務同意書 - email: 電子信箱地址 + email: 電子郵件地址 locale: 地區 password: 密碼 user/account: @@ -40,7 +40,7 @@ zh-TW: user: attributes: email: - blocked: 使用不被允許的電子信箱供應商 + blocked: 使用不被允許的電子郵件供應商 unreachable: 似乎不存在 role_id: elevated: 不能高於您目前的角色 |