diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-30 12:36:24 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-30 12:36:24 +0100 |
commit | 4444d8f9b3fac33caf3d4732e5f6112c5321d6ea (patch) | |
tree | c1fc1d30ed47bdc324fc7acddaaf40bf0a5a28d3 /config/locales/activerecord.co.yml | |
parent | b6fa500806f68d5394174e1f341dc61e3578760e (diff) | |
parent | 51625d3423051edb65081a7203bdbe52224d35f3 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'config/locales/activerecord.co.yml')
-rw-r--r-- | config/locales/activerecord.co.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/locales/activerecord.co.yml b/config/locales/activerecord.co.yml index 20c35b67f..0a9a936dd 100644 --- a/config/locales/activerecord.co.yml +++ b/config/locales/activerecord.co.yml @@ -2,8 +2,9 @@ co: activerecord: attributes: - status: - owned_poll: Scandagliu + poll: + expires_at: Fine + options: Scelte errors: models: account: |