diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 13:52:55 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 14:14:20 +0100 |
commit | 4df3b7cb067797982199c3e613ba32a9c7474348 (patch) | |
tree | bf237d385411f73e670af4c744d8239ab4799434 /config/locales/zh-TW.yml | |
parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
parent | 1a0d3c9c65d663210494ec9b55912debad6331f5 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.
Diffstat (limited to 'config/locales/zh-TW.yml')
-rw-r--r-- | config/locales/zh-TW.yml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 4498eff95..d05514b83 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -436,16 +436,6 @@ zh-TW: follows: 您關注的使用者 mutes: 您靜音的使用者 storage: 儲存空間大小 - followers: - domain: 網域 - explanation_html: 為確保個人隱私,您必須知道有哪些使用者正關注你。<strong>您的私密內容會被發送到所有您有被關注的站點上</strong>。如果您不信任這些站點的管理者,您可以選擇檢查或刪除您的關注者。 - followers_count: 關注者數量 - lock_link: 將你的帳戶設定為私人 - purge: 移除關注者 - success: 正準備軟性封鎖 %{count} 個網域的關注者…… - true_privacy_html: 請謹記,唯有<strong>點對點加密方可以真正確保你的隱私</strong>。 - unlocked_warning_html: 任何人都可以在關注你後立即查看非公開的嘟文。只要%{lock_link},你就可以審核並拒絕關注請求。 - unlocked_warning_title: 你的帳戶是公開的 generic: changes_saved_msg: 已成功儲存修改! save_changes: 儲存修改 @@ -594,7 +584,6 @@ zh-TW: development: 開發 edit_profile: 編輯使用者資訊 export: 匯出 - followers: 授權關注者 import: 匯入 migrate: 帳戶搬遷 notifications: 通知 |