diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-10 09:16:08 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-10 09:16:08 +0200 |
| commit | 5085559b15ef1c1fe3742757d00e5651fc52b5b5 (patch) | |
| tree | 0249b98caced1e39387564f04391eb1a0c39a2d7 /config/locales/zh-TW.yml | |
| parent | cb410f80a40d03b509cec244b0cdd4ed3957c6a0 (diff) | |
| parent | 830c2a9ccbe98e145640e12637ef3da56f41a7b5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
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 913442e17..988357e1b 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -436,7 +436,6 @@ zh-TW: warning: 警告，不要把它分享給任何人! your_token: 你的 token auth: - agreement_html: 按下下方的「註冊」即代表同意遵守 <a href="%{rules_path}">此伺服器的規則</a> 以及 <a href="%{terms_path}">使用條款</a>。 change_password: 密碼 confirm_email: 確認電子信箱位址 delete_account: 刪除帳戶 @@ -667,9 +666,7 @@ zh-TW: migrate: 帳戶搬遷 notifications: 通知 preferences: 偏好設定 - settings: 設定 two_factor_authentication: 兩階段認證 - your_apps: 你的應用程式 statuses: attached: description: 附件： %{attached} |