diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-16 21:52:38 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-16 21:52:38 +0200 |
| commit | 78ac246b877072bb5f94da34d29612fafde3a8ae (patch) | |
| tree | e1b781fe4fae9d02284e5e836338cc598431413f /config/locales/simple_form.zh-HK.yml | |
| parent | 80aad16e1035a72fec1af56aaac458a35e1f02c5 (diff) | |
| parent | 6bed372ad2d8da87f0f3cfa478e688c48aa94702 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn
Diffstat (limited to 'config/locales/simple_form.zh-HK.yml')
| -rw-r--r-- | config/locales/simple_form.zh-HK.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml index a21439a98..ed80b10ae 100644 --- a/config/locales/simple_form.zh-HK.yml +++ b/config/locales/simple_form.zh-HK.yml @@ -4,6 +4,7 @@ zh-HK: hints: defaults: avatar: 支援 PNG, GIF 或 JPG 圖片，檔案最大為 2MB，會縮裁成 400x400px + bot: 提醒用戶本帳號是機械人 digest: 僅在你長時間未登錄，且收到了私信時發送 display_name: one: 尚餘 <span class="name-counter">1</span> 個字 @@ -29,6 +30,7 @@ zh-HK: value: 內容 defaults: avatar: 個人頭像 + bot: 這帳號是機械人 confirm_new_password: 確認新密碼 confirm_password: 確認密碼 current_password: 目前密碼 |