diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-09-24 11:29:31 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-09-24 11:29:31 +0100 |
| commit | d8deb8418b4cd26c68eb1301959e156c19b111e2 (patch) | |
| tree | 99c346db95d17be9c5105ce47d5f3ac8e943e952 /locale/model_attributes.rb | |
| parent | 8459314b691f5b02277035219cd58f510d100a77 (diff) | |
| parent | 75542416a1cc36b353ade557b1bc4f729b02423a (diff) | |
Merge branch 'release/0.14'0.14
Conflicts:
locale/bg/app.po
locale/fr/app.po
locale/fr_CA/app.po
locale/he_IL/app.po
locale/hr/app.po
locale/it/app.po
locale/nb_NO/app.po
locale/pl/app.po
locale/sv/app.po
locale/vi/app.po
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') |