diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
| commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
| tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /config/locales/zh-HK.yml | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) | |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'config/locales/zh-HK.yml')
| -rw-r--r-- | config/locales/zh-HK.yml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index dd6541cc9..a5e997536 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -424,7 +424,7 @@ zh-HK: following: 成功！你正在關注： post_follow: close: 你也可以直接關閉這個頁面。 - return: 返回至個人資料頁 + return: 顯示個人資料頁 web: 返回本站 title: 關注 %{acct} datetime: @@ -514,6 +514,7 @@ zh-HK: '86400': 1 天後 expires_in_prompt: 永不過期 generate: 生成邀請連結 + invited_by: 你的邀請人是： max_uses: one: 1 次 other: "%{count} 次" @@ -609,14 +610,16 @@ zh-HK: browsers: alipay: 支付寶 blackberry: Blackberry - chrome: Chrome - edge: Microsoft Edge - firefox: Firefox + chrome: Chrome 瀏覽器 + edge: Microsoft Edge 瀏覽器 + electron: Electron 瀏覽器 + firefox: Firefox 瀏覽器 generic: 未知的瀏覽器 - ie: Internet Explorer + ie: Internet Explorer 瀏覽器 micro_messenger: 微信 nokia: Nokia S40 Ovi 瀏覽器 opera: Opera + otter: Otter 瀏覽器 phantom_js: PhantomJS qq: QQ瀏覽器 safari: Safari @@ -671,6 +674,7 @@ zh-HK: disallowed_hashtags: one: 包含不允許的標籤： %{tags} other: 包含不允許的標籤： %{tags} + language_detection: 自動偵測語言 open_in_web: 開啟網頁 over_character_limit: 超過了 %{max} 字的限制 pin_errors: |