diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-11 22:18:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-11 22:18:41 +0200 |
| commit | cde30407c6bfaaaa34f8b95c16f1b19cb0c41479 (patch) | |
| tree | 01b2e9139f6fae619de308413768ff0b7662c68e /config/locales/activerecord.zh-CN.yml | |
| parent | c64eef12069c3476f9956dfaaf6a3a9f91c14e2d (diff) | |
| parent | 82899b3d2e33d10175b1a6df41fb27c6d63d54b6 (diff) | |
Merge pull request #1105 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/activerecord.zh-CN.yml')
| -rw-r--r-- | config/locales/activerecord.zh-CN.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/activerecord.zh-CN.yml b/config/locales/activerecord.zh-CN.yml index 8628d6677..8d2ddfd14 100644 --- a/config/locales/activerecord.zh-CN.yml +++ b/config/locales/activerecord.zh-CN.yml @@ -1,6 +1,10 @@ --- zh-CN: activerecord: + attributes: + poll: + expires_at: 截止时间 + options: 选项 errors: models: account: |