diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-26 20:36:49 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-26 20:41:43 +0200 |
commit | 5bb8563f6c0ec9021d6e70d85544147e6c2d0f44 (patch) | |
tree | 96a939def53ee44f19d28c66f1d1f2195806ccc2 /config/locales/simple_form.zh-HK.yml | |
parent | 0e8de56a22aee089da8aa1c64bab941bc5911e5d (diff) | |
parent | 82e7988afcde5b19b99ad9ecf7973560a8a17f7f (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
Diffstat (limited to 'config/locales/simple_form.zh-HK.yml')
-rw-r--r-- | config/locales/simple_form.zh-HK.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml index 447b9ce7a..e28f935c2 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -7,16 +7,10 @@ zh-HK: avatar: 支援 PNG, GIF 或 JPG 圖片,檔案最大為 %{size},會縮裁成 %{dimensions}px bot: 提醒用戶本帳號是機械人 digest: 僅在你長時間未登錄,且收到了私信時發送 - display_name: - one: 尚餘 <span class="name-counter">1</span> 個字 - other: 尚餘 <span class="name-counter">%{count}</span> 個字 fields: 個人資料頁可顯示多至 4 個項目 header: 支援 PNG, GIF 或 JPG 圖片,檔案最大為 %{size},會縮裁成 %{dimensions}px locale: 使用者介面、電郵和通知的語言 locked: 你必須人手核准每個用戶對你的關注請求,而你的文章私隱會被預設為「只有關注你的人能看」 - note: - one: 尚餘 <span class="note-counter">1</span> 個字 - other: 尚餘 <span class="note-counter">%{count}</span> 個字 setting_default_language: 你文章的語言會被自動偵測,但不一定完全準確 setting_hide_network: 你關注的人和關注你的人將不會在你的個人資料頁上顯示 setting_noindex: 此設定會影響到你的公開個人資料以及文章頁面 |