diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
| commit | f9d000ebaec7732d5fcd46aa6685108a2619966b (patch) | |
| tree | 9593841cf520b117ca4c3d5b68b19e9124c852da /config/locales/simple_form.zh-TW.yml | |
| parent | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff) | |
| parent | c6598b17d9212c2d48395da73fa9529025d704cc (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.
Diffstat (limited to 'config/locales/simple_form.zh-TW.yml')
| -rw-r--r-- | config/locales/simple_form.zh-TW.yml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index 80cc8c2ee..000ec529b 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -75,6 +75,7 @@ zh-TW: types: disable: 停用 none: 什麼也不做 + sensitive: 有雷小心 silence: 安靜 suspend: 停權並不可逆的刪除帳戶資料 warning_preset_id: 使用警告預設 @@ -147,6 +148,13 @@ zh-TW: comment: 備註 invite_request: text: 加入的原因 + ip_block: + comment: 備註 + ip: IP 位址 + severities: + no_access: 封鎖 + sign_up_requires_approval: 限制註冊 + severity: 規則 notification_emails: digest: 傳送摘要信件 favourite: 當有使用者喜歡你的嘟文時，傳送電子信件通知 @@ -166,4 +174,7 @@ zh-TW: required: mark: "*" text: 必須填寫 + title: + sessions: + webauthn: 使用您的安全金鑰來登入 'yes': 是 |