diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:14:05 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:17:20 +0100 |
commit | 07eb31eeacc4e0364b839233a41fa65eb3c650ce (patch) | |
tree | 843cda5a4d9bc730aba9a13d0634fef5e2212515 /config/locales/zh-TW.yml | |
parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
parent | 874bd3ac0c56e2d2901785e170b27f5cde32b33b (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
Diffstat (limited to 'config/locales/zh-TW.yml')
-rw-r--r-- | config/locales/zh-TW.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 76a0cbb64..4498eff95 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -293,9 +293,6 @@ zh-TW: min_invite_role: disabled: 沒有人 title: 允許發送邀請的身份 - open: - desc_html: 允許所有人建立帳戶 - title: 開放註冊 show_known_fediverse_at_about_page: desc_html: 如果開啟,就會在時間軸預覽顯示其他站點嘟文,否則就只會顯示本站點嘟文。 title: 在時間軸預覽顯示其他站點嘟文 |