diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
| commit | eb39db7f93061c936fcb0bb24d5ba0c9a6186993 (patch) | |
| tree | e12b5f5c9fec1d698024c88cd9f3ea9fe5b249cd /config/locales/activerecord.zh-HK.yml | |
| parent | f0bb3ff53307aac7b9c64ec8a48d4ba1d2019513 (diff) | |
| parent | f890d2a766ae4c7fd8611dd4f3a15a13408f68c3 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml
Diffstat (limited to 'config/locales/activerecord.zh-HK.yml')
| -rw-r--r-- | config/locales/activerecord.zh-HK.yml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config/locales/activerecord.zh-HK.yml b/config/locales/activerecord.zh-HK.yml new file mode 100644 index 000000000..2ebf9586c --- /dev/null +++ b/config/locales/activerecord.zh-HK.yml @@ -0,0 +1,13 @@ +--- +zh-HK: + activerecord: + errors: + models: + account: + attributes: + username: + invalid: 只能使用字母、數字和下劃線 + status: + attributes: + reblog: + taken: 已經被轉推過 |