diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-28 13:52:58 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-28 13:52:58 +0100 |
| commit | 413ac13e17686247ba7d86c6c0bd89531b58a5a0 (patch) | |
| tree | c9bc4612c80f059be506c291721c3eb7d4d34644 /locale/model_attributes.rb | |
| parent | f1797b4868a01a27cefef53416da0acca47cac7f (diff) | |
| parent | 5c1a88c88ba69cec3924ec8a1d69d8784acaef3c (diff) | |
Merge branch 'release/0.6.4' into develop
Diffstat (limited to 'locale/model_attributes.rb')
| -rw-r--r-- | locale/model_attributes.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/locale/model_attributes.rb b/locale/model_attributes.rb index eef029404..bf4cd68da 100644 --- a/locale/model_attributes.rb +++ b/locale/model_attributes.rb @@ -2,6 +2,7 @@ _('Censor rule') _('CensorRule|Last edit comment') _('CensorRule|Last edit editor') +_('CensorRule|Regexp') _('CensorRule|Replacement') _('CensorRule|Text') _('Comment') @@ -41,6 +42,8 @@ _('InfoRequest|Allow new responses from') _('InfoRequest|Attention requested') _('InfoRequest|Awaiting description') _('InfoRequest|Described state') +_('InfoRequest|External url') +_('InfoRequest|External user name') _('InfoRequest|Handle rejected responses') _('InfoRequest|Idhash') _('InfoRequest|Law used') @@ -71,6 +74,7 @@ _('Profile photo') _('ProfilePhoto|Data') _('ProfilePhoto|Draft') _('Public body') +_('PublicBody|Api key') _('PublicBody|First letter') _('PublicBody|Home page') _('PublicBody|Last edit comment') @@ -100,8 +104,10 @@ _('TrackThing|Track query') _('TrackThing|Track type') _('User') _('User|About me') +_('User|Address') _('User|Admin level') _('User|Ban text') +_('User|Dob') _('User|Email') _('User|Email bounce message') _('User|Email bounced at') |