diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
commit | 659b8a12ece7110608ee84748e57647c08d1dbda (patch) | |
tree | 1d8350cdad20ad1eb8c67a4d17a18ff7183f22e5 /config/locales/simple_form.zh-HK.yml | |
parent | c2e528916cae422baee3d72a3b4409a23c476b3f (diff) | |
parent | 63c7b9157274f57c496399a1a5c728b32415034c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes
Diffstat (limited to 'config/locales/simple_form.zh-HK.yml')
-rw-r--r-- | config/locales/simple_form.zh-HK.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml index ed80b10ae..06d3f6f6c 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -15,12 +15,13 @@ zh-HK: note: one: 尚餘 <span class="note-counter">1</span> 個字 other: 尚餘 <span class="note-counter">%{count}</span> 個字 + setting_hide_network: 你關注的人和關注你的人將不會在你的個人資料頁上顯示 setting_noindex: 此設定會影響到你的公開個人資料以及文章頁面 setting_theme: 此設置會影響到你從任意設備登入時 Mastodon 的顯示樣式。 imports: data: 自其他服務站匯出的 CSV 檔案 sessions: - otp: 輸入你手機上生成的雙重認證碼,或者任意一個恢復代碼。 + otp: 輸入你手機上生成的雙重認證碼,或者任意一個恢復代碼: user: filtered_languages: 下面被選擇的語言的文章將不會出現在你的公共時間軸上 labels: @@ -54,6 +55,7 @@ zh-HK: setting_default_sensitive: 預設我的內容為敏感內容 setting_delete_modal: 刪推前詢問我 setting_display_sensitive_media: 預設我的媒體為敏感內容 + setting_hide_network: 隱藏你的社交網絡 setting_noindex: 阻止搜尋引擎檢索 setting_reduce_motion: 減低動畫效果 setting_system_font_ui: 使用系統預設字型 |