diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-31 22:21:15 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-01 00:18:13 +0200 |
commit | c1c514ca703f3e11adfe41734345b5277e886c50 (patch) | |
tree | d8e088898292ca6da0f979b9244781b2ce116c7e /config/locales/zh-TW.yml | |
parent | 88b593a63ff3d607d6f98553654c46bc7cfc0b7b (diff) | |
parent | 13ac8ca66ab01c92e4ebcc7221efb3d474c9fd0b (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.
Diffstat (limited to 'config/locales/zh-TW.yml')
-rw-r--r-- | config/locales/zh-TW.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index e2b376a3f..483cffe8e 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -46,7 +46,6 @@ zh-TW: people_who_follow: 關注 %{name} 的人 posts: 嘟文 posts_with_replies: 嘟文與回覆 - remote_follow: 跨站關注 reserved_username: 此用戶名已被保留 roles: admin: 管理員 @@ -488,7 +487,6 @@ zh-TW: unlocked_warning_title: 你的帳戶是公開的 generic: changes_saved_msg: 已成功儲存修改! - powered_by: 網站由 %{link} 開發 save_changes: 儲存修改 validation_errors: one: 送出的資料有問題 @@ -524,8 +522,6 @@ zh-TW: expires_at: 失效時間 uses: 已使用次數 title: 邀請使用者 - landing_strip_html: "<strong>%{name}</strong> 是一個在 %{link_to_root_path} 的使用者。只要您有任何 Mastodon 站點、或者聯盟站點的帳戶,便可以跨站關注此站使用者,或者與他們互動。" - landing_strip_signup_html: 如果您沒有這些帳戶,歡迎在<a href="%{sign_up_path}">這裡註冊</a>。 lists: errors: limit: 你所建立的列表數量已經達到上限 @@ -685,7 +681,6 @@ zh-TW: unlisted: 公開,但不在公共時間軸顯示 unlisted_long: 所有人都能看到,但不會出現在公共時間軸上 stream_entries: - click_to_show: 點選顯示 pinned: 置頂嘟文 reblogged: 轉嘟 sensitive_content: 敏感內容 |