diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
commit | ab5f450700085ce73621b28b813f2edc5f199785 (patch) | |
tree | 766214b52ed217903ae821285391f8e2d4b5f545 /config/locales/simple_form.zh-HK.yml | |
parent | 26c20a4ec7868753b284670575f28f201a5cef9f (diff) | |
parent | 7f59206944193591d7aef5cbd73edc7f5303add7 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
Diffstat (limited to 'config/locales/simple_form.zh-HK.yml')
-rw-r--r-- | config/locales/simple_form.zh-HK.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml index 06d3f6f6c..7a1cae68d 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -22,8 +22,6 @@ zh-HK: data: 自其他服務站匯出的 CSV 檔案 sessions: otp: 輸入你手機上生成的雙重認證碼,或者任意一個恢復代碼: - user: - filtered_languages: 下面被選擇的語言的文章將不會出現在你的公共時間軸上 labels: account: fields: @@ -40,7 +38,6 @@ zh-HK: email: 電郵地址 expires_in: 失效時間 fields: 資料 - filtered_languages: 封鎖下面語言的文章 header: 個人頁面頂部 locale: 語言 locked: 將用戶轉為「私人」 |