diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-09-24 09:23:44 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-09-24 09:23:44 +0100 |
| commit | 7d9b66d1ff31afa8d73ea1a81f4e612e41f89cb0 (patch) | |
| tree | 5206d9fbaf8d6af58bdaa35cefdfeb34a88c84ff /locale/model_attributes.rb | |
| parent | 40a28fa2fe21d752a15c11938791d620dd31d17f (diff) | |
| parent | 8e7432be764254e6a50e6a06e77bb93bb5bba9fe (diff) | |
Merge branch 'release/0.14' into wdtk
Conflicts:
app/views/request/show.html.erb
Diffstat (limited to 'locale/model_attributes.rb')
| -rw-r--r-- | locale/model_attributes.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/locale/model_attributes.rb b/locale/model_attributes.rb index ba3a60c90..9f7da5e62 100644 --- a/locale/model_attributes.rb +++ b/locale/model_attributes.rb @@ -35,6 +35,8 @@ _('IncomingMessage|Cached main body text unfolded') _('IncomingMessage|Last parsed') _('IncomingMessage|Mail from') _('IncomingMessage|Mail from domain') +_('IncomingMessage|Prominence') +_('IncomingMessage|Prominence reason') _('IncomingMessage|Sent at') _('IncomingMessage|Subject') _('IncomingMessage|Valid to reply to') @@ -58,7 +60,6 @@ _('InfoRequestEvent|Described state') _('InfoRequestEvent|Event type') _('InfoRequestEvent|Last described at') _('InfoRequestEvent|Params yaml') -_('InfoRequestEvent|Prominence') _('Mail server log') _('MailServerLog|Line') _('MailServerLog|Order') @@ -69,6 +70,8 @@ _('Outgoing message') _('OutgoingMessage|Body') _('OutgoingMessage|Last sent at') _('OutgoingMessage|Message type') +_('OutgoingMessage|Prominence') +_('OutgoingMessage|Prominence reason') _('OutgoingMessage|Status') _('OutgoingMessage|What doing') _('Post redirect') @@ -87,6 +90,9 @@ _('PublicBody|Disclosure log') _('PublicBody|First letter') _('PublicBody|Home page') _('PublicBody|Info requests count') +_('PublicBody|Info requests not held count') +_('PublicBody|Info requests overdue count') +_('PublicBody|Info requests successful count') _('PublicBody|Last edit comment') _('PublicBody|Last edit editor') _('PublicBody|Name') |