[Amavisd-new-commits] [SCM] Debian packaging for amavisd-new branch, master, updated. debian/1%2.6.4-4-19-g0977bee

[Harald Jenny]

The following commit has been merged in the master branch:
commit 0977bee30c5e81795f141b30232fa22f52f75d90
Author: Harald Jenny <harald at a-little-linux-box.at>
Date:   Thu Sep 8 19:30:59 2011 +0200

    update two missed l10n templates

diff --git a/debian/etc/en_US/template-spam-admin.txt b/debian/etc/en_US/template-spam-admin.txt
index 0cea13f..317acc3 100644
--- a/debian/etc/en_US/template-spam-admin.txt
+++ b/debian/etc/en_US/template-spam-admin.txt
@@ -1,12 +1,12 @@
 #
 # =============================================================================
-# This is a template for SPAM ADMINISTRATOR NOTIFICATIONS.
+# This is a template for spam ADMINISTRATOR NOTIFICATIONS.
 # For syntax and customization instructions see README.customize.
 # Long header fields will be automatically wrapped by the program.
 #
 From: %f
 Date: %d
-Subject: SPAM FROM [?%l||LOCAL ][?%a||\[%a\] ][?%s|<>|[?%o|(?)|%s]]
+Subject: Spam FROM [?%l||LOCAL ][?%a||[:client_addr_port] ]%s
 To: [? %#T |undisclosed-recipients:;|[%T|, ]]
 [? %#C |#|Cc: [%C|, ]]
 Message-ID: <SA%i@%h>
@@ -17,7 +17,7 @@ Internal reference code for the message is %n/%i
 
 [? %a |#|[:wrap|78||  |First upstream SMTP client IP address: \[%a\] %g]]
 [? %e |#|[:wrap|78||  |According to a 'Received:' trace,\
- the message originated at: \[%e\], %t]]
+ the message apparently originated at: \[%e\], %t]]
 
 [:wrap|78||  |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
 [:wrap|78||  |From: [:header_field|From][?[:dkim|author]|| (dkim:AUTHOR)]]
@@ -34,6 +34,6 @@ Internal reference code for the message is %n/%i
 ]
 [? %#N |#|The message WAS NOT relayed to:[\n%N]
 ]
-SpamAssassin report:
+Spam scanner report:
 [%A
 ]\
diff --git a/debian/etc/en_US/template-spam-sender.txt b/debian/etc/en_US/template-spam-sender.txt
index 3f42ba3..5d91afe 100644
--- a/debian/etc/en_US/template-spam-sender.txt
+++ b/debian/etc/en_US/template-spam-sender.txt
@@ -1,6 +1,6 @@
 #
 # =============================================================================
-# This is a template for SPAM SENDER NOTIFICATIONS.
+# This is a template for spam SENDER NOTIFICATIONS.
 # For syntax and customization instructions see README.customize.
 # The From, To and Date header fields will be provided automatically.
 # Long header fields will be automatically wrapped by the program.
@@ -9,8 +9,8 @@ Subject: Considered UNSOLICITED BULK EMAIL, apparently from you
 [? %m  |#|In-Reply-To: %m]
 Message-ID: <SS%i@%h>
 
-A message from %s to:[
--> %R]
+A message from %s[
+to: %R]
 
 was considered unsolicited bulk e-mail (UBE).
 
@@ -21,13 +21,13 @@ from you, or a sender address was faked and your e-mail address abused
 by third party, in which case we apologize for undesired notification.
 
 We do try to minimize backscatter for more prominent cases of UBE and
-for infected mail, but for less obvious cases of UBE some balance
-between losing genuine mail and sending undesired backscatter is sought,
-and there can be some collateral damage on both sides.
+for infected mail, but for less obvious cases some balance between
+losing genuine mail and sending undesired backscatter is sought,
+and there can be some collateral damage on either side.
 
 [? %a |#|[:wrap|78||  |First upstream SMTP client IP address: \[%a\] %g]]
 [? %e |#|[:wrap|78||  |According to a 'Received:' trace,\
- the message originated at: \[%e\], %t]]
+ the message apparently originated at: \[%e\], %t]]
 
 [:wrap|78||  |Return-Path: %s[?[:dkim|envsender]|| (OK)]]
 [:wrap|78||  |From: [:header_field|From|100][?[:dkim|author]|| (dkim:AUTHOR)]]
@@ -43,6 +43,6 @@ and there can be some collateral damage on both sides.
 [? %#D |Delivery of the email was stopped!
 ]#
 #
-# SpamAssassin report:
+# Spam scanner report:
 # [%A
 # ]\
diff --git a/debian/extract-upstream-en_US-templates.pl b/debian/extract-upstream-en_US-templates.pl
index ef04ff3..419a2e7 100755
--- a/debian/extract-upstream-en_US-templates.pl
+++ b/debian/extract-upstream-en_US-templates.pl
@@ -15,8 +15,8 @@ my @knowntemplates = (
 	[ 'VIRUS.*SENDER NOTIFICATIONS', 		'template-virus-sender.txt' ],
 	[ 'non-spam.*ADMINISTRATOR NOTIFICATIONS', 	'template-virus-admin.txt' ],
 	[ 'VIRUS.*RECIPIENTS NOTIFICATIONS', 		'template-virus-recipient.txt' ],
-	[ 'SPAM SENDER NOTIFICATIONS', 			'template-spam-sender.txt' ],
-	[ 'SPAM ADMINISTRATOR NOTIFICATIONS', 		'template-spam-admin.txt' ],
+	[ 'spam SENDER NOTIFICATIONS', 			'template-spam-sender.txt' ],
+	[ 'spam ADMINISTRATOR NOTIFICATIONS', 		'template-spam-admin.txt' ],
     [ 'RELEASE FROM A QUARANTINE',  'template-release-quarantine.txt' ],
     [ 'problem/feedback report', 'template-problem-feedback.txt' ],
     [ 'text part of an auto response', 'template-auto-response.txt' ],

-- 
Debian packaging for amavisd-new