diff options
author | ThibG <thib@sitedethib.com> | 2019-03-31 00:37:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-31 00:37:16 +0100 |
commit | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (patch) | |
tree | 324003d03c66caead9842a6052bc28caf7f654c2 /config/locales/activerecord.co.yml | |
parent | b6fa500806f68d5394174e1f341dc61e3578760e (diff) | |
parent | b72950fbd3536260df0b9c22179a6024d4d0c189 (diff) |
Merge pull request #976 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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: |