diff options
Diffstat (limited to 'config/locales/activerecord.cy.yml')
| -rw-r--r-- | config/locales/activerecord.cy.yml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/locales/activerecord.cy.yml b/config/locales/activerecord.cy.yml index 265530124..248e93ad5 100644 --- a/config/locales/activerecord.cy.yml +++ b/config/locales/activerecord.cy.yml @@ -1,6 +1,13 @@ --- cy: activerecord: +<<<<<<< HEAD +======= + attributes: + poll: + expires_at: Terfyn amser + options: Dewisiadau +>>>>>>> f1597e1ab... Merge pull request #1158 from ThibG/glitch-soc/merge-upstream errors: models: account: |