diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-12 15:06:46 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-12 15:06:46 +0000 |
| commit | a1ca0f9123a3aea843ba35508a97d5a4fd5cb0db (patch) | |
| tree | b9d3c1390f6b9c8b201e47507f26829b239f2773 /locale/model_attributes.rb | |
| parent | 8271b2c664f04d1b68a8b4d4fdb801f5c6b00b8c (diff) | |
| parent | c96b27c301023a6a1f50c12f0c387205b0255836 (diff) | |
Merge remote-tracking branch 'origin/release/0.6.8'0.6.8
Conflicts:
locale/cs/app.po
locale/sl/app.po
locale/sq/app.po
locale/tr/app.po
locale/uk/app.po
Diffstat (limited to 'locale/model_attributes.rb')
| -rw-r--r-- | locale/model_attributes.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/locale/model_attributes.rb b/locale/model_attributes.rb index 9620a5494..27925cd02 100644 --- a/locale/model_attributes.rb +++ b/locale/model_attributes.rb @@ -10,12 +10,6 @@ _('Comment|Body') _('Comment|Comment type') _('Comment|Locale') _('Comment|Visible') -_('Exim log') -_('EximLog|Line') -_('EximLog|Order') -_('Exim log done') -_('EximLogDone|Filename') -_('EximLogDone|Last stat') _('Foi attachment') _('FoiAttachment|Charset') _('FoiAttachment|Content type') @@ -58,6 +52,12 @@ _('InfoRequestEvent|Event type') _('InfoRequestEvent|Last described at') _('InfoRequestEvent|Params yaml') _('InfoRequestEvent|Prominence') +_('Mail server log') +_('MailServerLog|Line') +_('MailServerLog|Order') +_('Mail server log done') +_('MailServerLogDone|Filename') +_('MailServerLogDone|Last stat') _('Outgoing message') _('OutgoingMessage|Body') _('OutgoingMessage|Last sent at') @@ -76,6 +76,7 @@ _('ProfilePhoto|Data') _('ProfilePhoto|Draft') _('Public body') _('PublicBody|Api key') +_('PublicBody|Disclosure log') _('PublicBody|First letter') _('PublicBody|Home page') _('PublicBody|Info requests count') @@ -89,6 +90,7 @@ _('PublicBody|Short name') _('PublicBody|Url name') _('PublicBody|Version') _('Public body/translation') +_('PublicBody::Translation|Disclosure log') _('PublicBody::Translation|First letter') _('PublicBody::Translation|Locale') _('PublicBody::Translation|Name') |