diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-11 15:14:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 15:14:31 +0200 |
| commit | bb50ec2e6687238ad8b2ec545a73270fee7a7b09 (patch) | |
| tree | b2b553e7f39215f89379c09e50993b9fa2dd3e70 /config/locales/activerecord.oc.yml | |
| parent | 31e4fcb006c6ef2d8e1a4c765e897afa1cba1b5c (diff) | |
| parent | f5b4e9a54a44ada7965d5792a27f42972afee8a2 (diff) | |
Merge pull request #987 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/activerecord.oc.yml')
| -rw-r--r-- | config/locales/activerecord.oc.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/locales/activerecord.oc.yml b/config/locales/activerecord.oc.yml index e664bd409..1157d9769 100644 --- a/config/locales/activerecord.oc.yml +++ b/config/locales/activerecord.oc.yml @@ -2,8 +2,9 @@ oc: activerecord: attributes: - status: - owned_poll: Sondatge + poll: + expires_at: Data limita + options: Opcions errors: models: account: |