diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 19:31:32 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 21:49:35 +0200 |
| commit | 1488be7d9683fb3442c6f7bd4fd911d224f0c929 (patch) | |
| tree | 42548a596bb118e08c14c4d0ae9eacb3e8b2f36b /config/locales/zh-TW.yml | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
| parent | d22f3a7d5140ef1c3ae6e9bd2241bbb5289af8d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json
Diffstat (limited to 'config/locales/zh-TW.yml')
| -rw-r--r-- | config/locales/zh-TW.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 801ea7cea..b7a9a2ec2 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -424,7 +424,6 @@ zh-TW: your_token: 你的 token auth: change_password: 密碼 - confirm_email: 確認電子信箱位址 delete_account: 刪除帳戶 delete_account_html: 如果你想刪除你的帳戶，請<a href="%{path}">點擊這裡繼續</a>。你需要確認你的操作。 didnt_get_confirmation: 沒有收到驗證信? |