diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:58 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:58 +0000 |
| commit | ea04caec95cea132143997a1870ae8dd1fc0db5c (patch) | |
| tree | f199e3f4187091a7a7c78f7fd6901529658174f7 /locale/model_attributes.rb | |
| parent | 59b5b15d56600ffc26d657dfea134ffcfc879725 (diff) | |
| parent | a76010c99459559a29901ed75b847384248c7c6e (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'locale/model_attributes.rb')
| -rw-r--r-- | locale/model_attributes.rb | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/locale/model_attributes.rb b/locale/model_attributes.rb index e68b40168..7265ceb5b 100644 --- a/locale/model_attributes.rb +++ b/locale/model_attributes.rb @@ -32,11 +32,6 @@ _('track thing') _('TrackThing|Track query') _('TrackThing|Track medium') _('TrackThing|Track type') -_('censor rule') -_('CensorRule|Text') -_('CensorRule|Replacement') -_('CensorRule|Last edit editor') -_('CensorRule|Last edit comment') _('info request event') _('InfoRequestEvent|Event type') _('InfoRequestEvent|Params yaml') @@ -44,6 +39,11 @@ _('InfoRequestEvent|Described state') _('InfoRequestEvent|Calculated state') _('InfoRequestEvent|Last described at') _('InfoRequestEvent|Prominence') +_('censor rule') +_('CensorRule|Text') +_('CensorRule|Replacement') +_('CensorRule|Last edit editor') +_('CensorRule|Last edit comment') _('post redirect') _('PostRedirect|Token') _('PostRedirect|Uri') @@ -51,23 +51,22 @@ _('PostRedirect|Post params yaml') _('PostRedirect|Email token') _('PostRedirect|Reason params yaml') _('PostRedirect|Circumstance') -_('holiday') -_('Holiday|Day') -_('Holiday|Description') -_('exim log done') -_('EximLogDone|Filename') -_('EximLogDone|Last stat') _('incoming message') _('IncomingMessage|Cached attachment text clipped') _('IncomingMessage|Cached main body text folded') _('IncomingMessage|Cached main body text unfolded') -_('IncomingMessage|Sent at') _('IncomingMessage|Subject') -_('IncomingMessage|Safe mail from') _('IncomingMessage|Mail from domain') _('IncomingMessage|Valid to reply to') -_('user info request sent alert') -_('UserInfoRequestSentAlert|Alert type') +_('IncomingMessage|Last parsed') +_('IncomingMessage|Mail from') +_('IncomingMessage|Sent at') +_('holiday') +_('Holiday|Day') +_('Holiday|Description') +_('exim log done') +_('EximLogDone|Filename') +_('EximLogDone|Last stat') _('user') _('User|Email') _('User|Name') @@ -79,6 +78,20 @@ _('User|Last daily track email') _('User|Admin level') _('User|Ban text') _('User|About me') +_('User|Locale') +_('User|Email bounced at') +_('User|Email bounce message') +_('User|No limit') +_('foi attachment') +_('FoiAttachment|Content type') +_('FoiAttachment|Filename') +_('FoiAttachment|Charset') +_('FoiAttachment|Display size') +_('FoiAttachment|Url part number') +_('FoiAttachment|Within rfc822 subject') +_('FoiAttachment|Hexdigest') +_('user info request sent alert') +_('UserInfoRequestSentAlert|Alert type') _('info request') _('InfoRequest|Title') _('InfoRequest|Described state') |