diff options
author | Louise Crow <louise.crow@gmail.com> | 2014-05-15 17:01:22 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2014-05-15 17:01:22 +0100 |
commit | bb5f95040d377d86629012347343fbf2c7dda016 (patch) | |
tree | be696ec2615b098db34449a982fcb09a68c9c49b /locale/model_attributes.rb | |
parent | 6d215fba5cc709c43f12f86da39a643e4be5922b (diff) | |
parent | 21027d0d1197e7ac447296ab68a25159860888b2 (diff) |
Merge remote-tracking branch 'origin/release/0.18'0.18
Diffstat (limited to 'locale/model_attributes.rb')
-rw-r--r-- | locale/model_attributes.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/locale/model_attributes.rb b/locale/model_attributes.rb index 838fcc048..8cbe8528f 100644 --- a/locale/model_attributes.rb +++ b/locale/model_attributes.rb @@ -118,15 +118,19 @@ _('PublicBodyChangeRequest|User name') _('Purge request') _('PurgeRequest|Model') _('PurgeRequest|Url') +_('Spam address') +_('SpamAddress|Email') _('Track thing') _('TrackThing|Track medium') _('TrackThing|Track query') _('TrackThing|Track type') _('User') _('User|About me') +_('User|Address') _('User|Admin level') _('User|Ban text') _('User|Can make batch requests') +_('User|Dob') _('User|Email') _('User|Email bounce message') _('User|Email bounced at') |