diff options
| author | seb <seb@seb-U36JC> | 2011-11-24 09:21:36 +0000 |
|---|---|---|
| committer | seb <seb@seb-U36JC> | 2011-11-24 09:21:36 +0000 |
| commit | a4e533f1588a5d34dca4ab462b58ddd83eed37c5 (patch) | |
| tree | 58bb3b57ec5664e094ae151c18b6c1915256e364 /locale/model_attributes.rb | |
| parent | d473fce1d0451c913d3ef697d3b45bd58c6fff54 (diff) | |
| parent | e649c2a7f19d0a75206149d886ff47b3ccda4e91 (diff) | |
Merge branch 'develop' into xapian-dcabo
Conflicts:
spec/models/xapian_spec.rb
Diffstat (limited to 'locale/model_attributes.rb')
| -rw-r--r-- | locale/model_attributes.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/locale/model_attributes.rb b/locale/model_attributes.rb index c52dcb37c..e68b40168 100644 --- a/locale/model_attributes.rb +++ b/locale/model_attributes.rb @@ -44,8 +44,6 @@ _('InfoRequestEvent|Described state') _('InfoRequestEvent|Calculated state') _('InfoRequestEvent|Last described at') _('InfoRequestEvent|Prominence') -_('raw email') -_('RawEmail|Data binary') _('post redirect') _('PostRedirect|Token') _('PostRedirect|Uri') @@ -63,6 +61,11 @@ _('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') _('user') @@ -85,4 +88,5 @@ _('InfoRequest|Url title') _('InfoRequest|Law used') _('InfoRequest|Allow new responses from') _('InfoRequest|Handle rejected responses') +_('InfoRequest|Idhash') #DO NOT MODIFY! AUTOMATICALLY GENERATED FILE! |