[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-1-gf94c9ab

Michael Tautschnig tautschnig at joey.forsyte
Wed Mar 25 19:46:39 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit f94c9abcddce262a21ab81800bb3fa4b51e9879b
Author: Michael Tautschnig <tautschnig at joey.forsyte>
Date:   Wed Mar 25 20:45:27 2009 +0100

    Partly improved debconf templates for clamav-milter
    
    - This one will be sent to debian-l10n-english for further review.
    
    Signed-off-by: Michael Tautschnig <tautschnig at joey.forsyte>

diff --git a/debian/clamav-milter.templates b/debian/clamav-milter.templates
index f0b521c..a7bd046 100644
--- a/debian/clamav-milter.templates
+++ b/debian/clamav-milter.templates
@@ -15,9 +15,12 @@ Type: string
 Default: /var/run/clamav/milter.ctl
 _Description: Define the interface through to communicate with sendmail:
  Possible formats are:
- [[unix|local]:]/path/to/file - to specify a unix domain socket
- inet:port@[hostname|ip-address] - to specify an ipv4 socket
- inet6:port@[hostname|ip-address] - to specify an ipv6 socket
+ .
+ Unix domain socket: [[unix|local]:]/path/to/file
+ .
+ IPv4 socket: inet:port@[hostname|ip-address]
+ .
+ IPv6 socket: inet6:port@[hostname|ip-address]
 
 Template: clamav-milter/FixStaleSocket
 Type: boolean
@@ -46,7 +49,7 @@ Template: clamav-milter/ReadTimeout
 Type: string
 Default: 120
 _Description: Waiting for data from clamd will timeout after this time (seconds):
- Value of 0 disables the timeout.
+ Set to a value of '0' to disable the timeout.
 
 Template: clamav-milter/Foreground
 Type: boolean
@@ -57,7 +60,7 @@ Template: clamav-milter/Chroot
 Type: string
 _Description: Chroot to directory:
  Chrooting is performed just after reading the config file and before dropping
- privileges. An empty values means don't chroot.
+ privileges. An empty value means don't chroot.
 
 Template: clamav-milter/PidFile
 Type: string
@@ -70,21 +73,17 @@ Template: clamav-milter/TemporaryDirectory
 Type: string
 Default: /tmp
 _Description: Optional path to the global temporary directory:
-  Default: system specific (usually /tmp or /var/tmp).
+  If unset, $TMPDIR and $TEMP will be honored.
 
 Template: clamav-milter/ClamdSocket
 Type: string
 Default: unix:/var/run/clamav/clamd.ctl
 _Description: Define the clamd socket to connect to for scanning:
- Syntax:
- unix:path
- tcp:host:port
- The first syntax specifies a local unix socket (needs an bsolute path) e.g.:
-     unix:/var/run/clamd/clamd.socket
- The second syntax specifies a tcp local or remote tcp socket: the host can be a
- hostname or an ip address; the ":port" field is only required for IPv6
- addresses, otherwise it defaults to 3310
-     tcp:192.168.0.1
+ To refer to a local unix socket using a absolute path, use unix:path (e.g.,
+ unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified
+ using the tcp:host:port syntax. The host can be a hostname or an ip address;
+ the ":port" field is only required for IPv6 addresses, otherwise it defaults to
+ 3310 (e.g., tcp:192.168.0.1).
  .
  This option can be repeated several times (separated by whitespace) with
  different sockets or even with the same socket: clamd servers will be selected
@@ -95,8 +94,9 @@ Type: string
 _Description: Exclusions - IP ranges:
  Messages originating from these hosts/networks will not be scanned.  This
  option takes a host(name)/mask pair in CIRD notation and can be repeated
- several times. If "/mask" is omitted, a host is assumed.  To specify a locally
- orignated, non-smtp, email use the keyword "local".
+ several times (separated by whitespace). If "/mask" is omitted, a host is
+ assumed.  To specify a locally originated, non-smtp, email use the keyword
+ "local".
  .
  If unset, everything regardless of the origin is scanned.
 
@@ -104,11 +104,12 @@ Template: clamav-milter/Whitelist
 Type: string
 _Description: Exclusions - Regular expressions:
  This option specifies a file which contains a list of POSIX regular
- expressions. Addresses (sent to or from - see below) matching these regexes
- will not be scanned.  Optionally each line can start with the string "From:" or
- "To:" (note: no whitespace after the colon) indicating if it is, respectively,
- the sender or recipient that is to be whitelisted.  If the field is missing,
- "To:" is assumed.
+ expressions. Addresses (sent to or from) matching these regexes will not be
+ scanned.  Optionally each line can start with the string "From:" or "To:"
+ (note: no whitespace after the colon) indicating if it is, respectively, the
+ sender or recipient that is to be whitelisted.  If the field is missing, "To:"
+ is assumed.
+ .
  Lines in this file starting with #, : or ! are ignored.
 
 Template: clamav-milter/OnClean
@@ -116,21 +117,21 @@ Type: select
 Choices: Accept, Reject, Defer, Blackhole, Quarantine
 Default: Accept
 _Description: Action to be performed on clean messages (mostly useful for testing):
- The following group of options controls the delievery process under
- different circumstances.
  The following actions are available:
- - Accept
-   The message is accepted for delievery
- - Reject
-   Immediately refuse delievery (a 5xx error is returned to the peer)
- - Defer
-   Return a temporary failure message (4xx) to the peer
- - Blackhole (not available for OnFail)
-   Like accept but the message is sent to oblivion
- - Quarantine (not available for OnFail)
-   Like accept but message is quarantined instead of being delivered
-   In sendmail the quarantine queue can be examined via mailq -qQ
-   For Postfix this causes the message to be accepted but placed on hold
+ .
+ - Accept: The message is accepted for delievery
+ .
+ - Reject: Immediately refuse delievery (a 5xx error is returned to the peer)
+ .
+ - Defer: Return a temporary failure message (4xx) to the peer
+ .
+ - Blackhole (not available for OnFail): Like accept but the message is sent to
+   oblivion
+ .
+ - Quarantine (not available for OnFail): Like accept but message is quarantined
+   instead of being delivered In sendmail the quarantine queue can be examined
+   via mailq -qQ For Postfix this causes the message to be accepted but placed
+   on hold
 
 Template: clamav-milter/OnInfected
 Type: select
@@ -149,23 +150,22 @@ _Description: Action to be performed on error conditions:
 Template: clamav-milter/RejectMsg
 Type: string
 _Description: Specific rejection reason for infected messages:
- It is therefore only useful together with "OnInfected Reject".
- The string "%v", if present, will be replaced with the virus name.
+ It is only useful together with "OnInfected Reject".  The string "%v", if
+ present, will be replaced with the virus name.
 
 Template: clamav-milter/AddHeader
 Type: boolean
 Default: false
 _Description: Add headers to processed messages?
- If adding headers is enabled, an "X-Virus-Scanned" and an "X-Virus-Status"
- headers will be attached to each processed message, possibly replacing existing
+ If adding headers is enabled, "X-Virus-Scanned" and "X-Virus-Status" headers
+ will be attached to each processed message, possibly replacing existing
  headers. 
 
 Template: clamav-milter/LogFile
 Type: string
 Default: none
 _Description: Log to file:
- LogFile must be writable for the user running daemon.
- A full path is required.
+ LogFile must be writable for the user running daemon.  A full path is required.
  .
  Logging via syslog is configured independently of this entry.
 
@@ -180,7 +180,7 @@ Template: clamav-milter/LogFileMaxSize
 Type: string
 Default: 1M
 _Description: Maximum size of the log file (unit Mb):
- Value of 0 disables the limit.
+ Set to a value of '0' to disable the timeout.
 
 Template: clamav-milter/LogTime
 Type: boolean
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 35367b8..0fa6cdf 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-15 19:16+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -556,10 +556,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -606,9 +621,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "Hodnotou „0“ časový limit zrušíte."
 
 #. Type: boolean
@@ -628,7 +645,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -654,7 +671,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -667,13 +684,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -697,8 +712,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -718,12 +734,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -735,20 +756,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -782,8 +831,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -796,8 +845,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -811,7 +860,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -842,13 +891,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Maximální povolená délka proudu (v Mb):"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "Hodnotou „0“ limit zrušíte."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -906,6 +948,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "Hodnotou „0“ limit zrušíte."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Chcete povolit prohledávání RAR archivů?"
 
diff --git a/debian/po/da.po b/debian/po/da.po
index 9d03593..5789b68 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav_0.69-0.70-rc-2_da\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2005-06-22 12:57+0200\n"
 "Last-Translator: Claus Hindsgaul <claus_h at image.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -576,10 +576,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -626,9 +641,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "Værdien 0 deaktiverer størrelsesbegrænsningen."
 
 #. Type: boolean
@@ -648,7 +665,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -674,7 +691,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -687,13 +704,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -717,8 +732,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -738,12 +754,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -755,20 +776,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -802,8 +851,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -816,8 +865,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -831,7 +880,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -862,13 +911,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Maksimalt tilladt længde af datastrøm (i Mb):"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "Værdien 0 deaktiverer størrelsesbegrænsningen."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -926,6 +968,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "Værdien 0 deaktiverer størrelsesbegrænsningen."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Ønsker du at aktivere skanning af RAR-arkiver?"
 
diff --git a/debian/po/de.po b/debian/po/de.po
index d02cd35..c1aa254 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav 0.87.1-2\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-21 16:39+0200\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -570,10 +570,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -621,9 +636,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "Die Eingabe von »0« hebt die Zeitbeschränkung auf."
 
 #. Type: boolean
@@ -643,7 +660,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -669,7 +686,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -682,13 +699,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -712,8 +727,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -733,12 +749,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -750,20 +771,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -797,8 +846,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -811,8 +860,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -826,7 +875,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -857,13 +906,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Maximale Datenstromlänge (in MByte) zulassen:"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "Der Eingabe von »0« hebt die Begrenzung auf."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -921,6 +963,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "Der Eingabe von »0« hebt die Begrenzung auf."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Sollen RAR-Archive überprüft werden?"
 
@@ -973,8 +1019,8 @@ msgstr ""
 #~ "ClamAV team dropped support for the 'mirrors.txt' configuration file."
 #~ msgstr ""
 #~ "Das ClamAV-Team hat die Unterstützung für die Konfigurationsdatei "
-#~ "»mirrors.txt« eingestellt, weil die Spiegel-Server-Datenbank durch das DNS "
-#~ "verwaltet wird."
+#~ "»mirrors.txt« eingestellt, weil die Spiegel-Server-Datenbank durch das "
+#~ "DNS verwaltet wird."
 
 #~ msgid ""
 #~ "If additional mirrors are mentioned there, this file will be backed up "
diff --git a/debian/po/es.po b/debian/po/es.po
index 092c5aa..894fc20 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -25,8 +25,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav 0.88.6-1\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-07 10:54+0200\n"
 "Last-Translator: Javi Fernández-Sanguino <jfs at debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -191,9 +191,9 @@ msgid ""
 "making it easy to miss when freshclam really can't update the database."
 msgstr ""
 "Si el demonio se ejecuta sin conexión a red el fichero de registro se "
-"llenará con un montón de entradas del estilo «ERROR: Connection with database."
-"clamav.net failed.», haciendo más dificil encontrar cuándo realmente no "
-"puede actualizar la base de datos."
+"llenará con un montón de entradas del estilo «ERROR: Connection with "
+"database.clamav.net failed.», haciendo más dificil encontrar cuándo "
+"realmente no puede actualizar la base de datos."
 
 #. Type: string
 #. Description
@@ -286,8 +286,8 @@ msgid ""
 "sockets, clamd can be accessed through a file. Local UNIX sockets are "
 "recommended for security reasons."
 msgstr ""
-"Si escoge TCP se podrá acceder al demonio «clamd» de forma remota. Clamd será "
-"accesible a través de un fichero si escoge sockets UNIX locales. Se "
+"Si escoge TCP se podrá acceder al demonio «clamd» de forma remota. Clamd "
+"será accesible a través de un fichero si escoge sockets UNIX locales. Se "
 "recomienda el uso de sockets UNIX locales por motivos de seguridad."
 
 #. Type: string
@@ -322,8 +322,8 @@ msgid ""
 "Enter \"any\" to listen on every IP address configured. If you want to "
 "listen on a single address or host name, enter it here."
 msgstr ""
-"Escriba «any» para que escuche en cada dirección IP configurada. Si en vez de "
-"eso quiere que escuche en una única dirección o nombre de servidor, "
+"Escriba «any» para que escuche en cada dirección IP configurada. Si en vez "
+"de eso quiere que escuche en una única dirección o nombre de servidor, "
 "introdúzcala aquí."
 
 #. Type: error
@@ -383,8 +383,8 @@ msgid ""
 "clamav-docs/clamdoc.pdf or the manpage clamscan(5)."
 msgstr ""
 "Si desea más información sobre los tipos de archivos que se analizarán, "
-"consulte «/usr/share/doc/clamav/clamdoc.pdf.gz» o la página de manual clamscan"
-"(5)."
+"consulte «/usr/share/doc/clamav/clamdoc.pdf.gz» o la página de manual "
+"clamscan(5)."
 
 #. Type: string
 #. Description
@@ -590,10 +590,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -641,9 +656,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "El valor 0 inhabilita el límite de tamaño."
 
 #. Type: boolean
@@ -663,7 +680,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -689,7 +706,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -702,13 +719,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -732,8 +747,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -753,12 +769,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -770,20 +791,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -817,8 +866,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -831,8 +880,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -846,7 +895,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -877,13 +926,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Longitud máxima de secuencia permitida (en unidades de Mb)?"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "El valor 0 inhabilita el límite de tamaño."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -941,6 +983,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "El valor 0 inhabilita el límite de tamaño."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "¿Quiere habilitar el análisis de archivos RAR?"
 
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 92299ca..b52fc90 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav-eu\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2008-09-24 11:03+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -558,10 +558,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -609,9 +624,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr " '0' ezarriaz denboraz-kanpo muga desgaituko da."
 
 #. Type: boolean
@@ -631,7 +648,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -657,7 +674,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -670,13 +687,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -700,8 +715,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -721,12 +737,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -738,20 +759,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -785,8 +834,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -799,8 +848,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -814,7 +863,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -845,13 +894,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Onartzen den gehienezko korronte tamaina (unitate Mb):"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "'0' ezarriaz gero muga hau ezgaituko da."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -909,6 +951,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "'0' ezarriaz gero muga hau ezgaituko da."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "RAR artxibo arakatzea gaitu nahi al duzu?"
 
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 574794c..f74e913 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-17 12:37+0200\n"
 "Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -553,10 +553,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -603,9 +618,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "Asetus 0 poistaa aikakatkaisun."
 
 #. Type: boolean
@@ -625,7 +642,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -651,7 +668,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -664,13 +681,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -694,8 +709,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -715,12 +731,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -732,20 +753,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -779,8 +828,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -793,8 +842,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -808,7 +857,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -839,13 +888,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Syötevirran suurin sallittu pituus (yksikkö Mb):"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "Asetus 0 poistaa tämän rajoituksen."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -903,6 +945,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "Asetus 0 poistaa tämän rajoituksen."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Otetaanko käyttöön RAR-arkistojen tutkinta?"
 
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 00655de..a04bb9f 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-05 08:13+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -468,7 +468,8 @@ msgstr ""
 #. Description
 #: ../clamav-base.templates:19001
 msgid "Log file for clamav-daemon (enter none to disable):"
-msgstr "Fichier de journalisation de clamav-daemon (« none » pour désactiver) :"
+msgstr ""
+"Fichier de journalisation de clamav-daemon (« none » pour désactiver) :"
 
 #. Type: boolean
 #. Description
@@ -578,10 +579,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -629,9 +645,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "Une valeur nulle désactive le délai d'expiration."
 
 #. Type: boolean
@@ -651,7 +669,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -677,7 +695,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -690,13 +708,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -720,8 +736,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -741,12 +758,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -758,20 +780,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -805,8 +855,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -819,8 +869,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -834,7 +884,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -865,13 +915,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Longueur maximale (en Mo) autorisée pour les flux :"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "Une valeur nulle désactivera cette limite."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -929,6 +972,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "Une valeur nulle désactivera cette limite."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Souhaitez-vous activer la vérification des archives RAR ?"
 
@@ -1013,10 +1060,10 @@ msgstr ""
 #~ "Exim, AMaVis)."
 #~ msgstr ""
 #~ "ClamAV fonctionne désormais par défaut avec les droits de l'utilisateur "
-#~ "non privilégié « clamav ». Si votre configuration précédente utilisait une "
-#~ "« socket » ou un fichier PID (fichier d'identification de processus) dans /"
-#~ "var/run, clam ne démarrera pas après cette mise à jour. Veuillez exécuter "
-#~ "« dpkg-reconfigure clamav-daemon » et changer l'emplacement de la "
-#~ "« socket » pour /var/run/clamav/. Vous devez également mettre à jour la "
-#~ "configuration de tous les logiciels qui s'en servent (par exemple Exim, "
-#~ "AMaVis, etc.)."
+#~ "non privilégié « clamav ». Si votre configuration précédente utilisait "
+#~ "une « socket » ou un fichier PID (fichier d'identification de processus) "
+#~ "dans /var/run, clam ne démarrera pas après cette mise à jour. Veuillez "
+#~ "exécuter « dpkg-reconfigure clamav-daemon » et changer l'emplacement de "
+#~ "la « socket » pour /var/run/clamav/. Vous devez également mettre à jour "
+#~ "la configuration de tous les logiciels qui s'en servent (par exemple "
+#~ "Exim, AMaVis, etc.)."
diff --git a/debian/po/gl.po b/debian/po/gl.po
index a8f0447..2cb253f 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-13 11:43+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -559,10 +559,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -610,9 +625,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "Se introduce \"0\" hase desactivar o límite de tempo."
 
 #. Type: boolean
@@ -632,7 +649,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -658,7 +675,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -671,13 +688,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -701,8 +716,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -722,12 +738,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -739,20 +760,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -786,8 +835,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -800,8 +849,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -815,7 +864,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -846,13 +895,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Lonxitude de fluxo máxima (en Mb) admitida:"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "Se introduce \"0\" o límite ha quedar desactivado."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -910,6 +952,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "Se introduce \"0\" o límite ha quedar desactivado."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "¿Quere activar a exploración de arquivos RAR?"
 
diff --git a/debian/po/it.po b/debian/po/it.po
index 1eed7b1..681301d 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav 0.91.2-3\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-05 09:15+0200\n"
 "Last-Translator: Cristian Rigamonti <cri at linux.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -557,10 +557,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -608,9 +623,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "Il valore \"0\" disabilita il limite di tempo."
 
 #. Type: boolean
@@ -630,7 +647,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -656,7 +673,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -669,13 +686,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -699,8 +714,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -720,12 +736,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -737,20 +758,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -784,8 +833,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -798,8 +847,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -813,7 +862,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -844,13 +893,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Massima lunghezza consentita degli stream (in Mb)?"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "Il valore \"0\" disabilita il limite di dimensione."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -908,6 +950,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "Il valore \"0\" disabilita il limite di dimensione."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Si desidera abilitare l'analisi degli archivi RAR?"
 
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 0e7e234..37dae7a 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-11 16:26+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -558,10 +558,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -608,9 +623,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "'0' を入力すると、タイムアウトが無効になります。"
 
 #. Type: boolean
@@ -630,7 +647,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -656,7 +673,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -669,13 +686,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -699,8 +714,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -720,12 +736,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -737,20 +758,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -784,8 +833,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -798,8 +847,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -813,7 +862,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -844,13 +893,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "許可する最大ストリーム長 (Mb 単位):"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "'0' を入力すると、制限が無効になります。"
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -908,6 +950,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "'0' を入力すると、制限が無効になります。"
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "RAR アーカイブの操作を有効にしますか?"
 
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 77e0505..03ea9d1 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav_0.94.dfsg-1_nl\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2008-10-06 22:09-0600\n"
 "Last-Translator: Paul Gevers <paul at climbing.nl>\n"
 "Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -586,10 +586,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -637,9 +652,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "De waarde 0 schakelt de tijdlimiet uit."
 
 #. Type: boolean
@@ -659,7 +676,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -685,7 +702,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -698,13 +715,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -728,8 +743,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -749,12 +765,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -766,20 +787,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -813,8 +862,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -827,8 +876,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -842,7 +891,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -873,13 +922,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Maximaal toegestane datastroomlengte (in Mb):"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "De waarde 0 betekent ongelimiteerd."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -937,6 +979,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "De waarde 0 betekent ongelimiteerd."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Wilt u het scannen van RAR-archieven aanzetten?"
 
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 9b8de2e..870a833 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav 0.91.2-4\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-19 20:46+0100\n"
 "Last-Translator: Ricardo Silva <ardoric at gmail.com>\n"
 "Language-Team: Native Portuguese <traduz at debianpt.org>\n"
@@ -558,10 +558,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -609,9 +624,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "O valor '0' desactiva o limite de tempo."
 
 #. Type: boolean
@@ -631,7 +648,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -657,7 +674,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -670,13 +687,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -700,8 +715,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -721,12 +737,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -738,20 +759,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -785,8 +834,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -799,8 +848,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -814,7 +863,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -845,13 +894,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Dimensão máxima da stream (unidades Mb) permitida:"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "Especificar '0' desactiva este limite."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -909,6 +951,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "Especificar '0' desactiva este limite."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Quer activar a análise de arquivos RAR?"
 
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 0653095..ce41e92 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-06 14:39-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw at debian.org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese at lists.debian.org>\n"
@@ -568,10 +568,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -619,9 +634,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "O valor 0 (zero) desabilita o limite de tamanho."
 
 #. Type: boolean
@@ -641,7 +658,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -667,7 +684,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -680,13 +697,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -710,8 +725,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -731,12 +747,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -748,20 +769,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -795,8 +844,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -809,8 +858,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -824,7 +873,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -855,13 +904,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Tamamho máximo de \"stream\" permitido (unidade Mb):"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "O valor 0 (zero) desabilita o limite de tamanho."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -919,6 +961,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "O valor 0 (zero) desabilita o limite de tamanho."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Deseja habilitar a verificação de arquivos RAR?"
 
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 5e0ca0f..91481b1 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.91.2-4\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-20 17:29+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -555,10 +555,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -606,9 +621,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "Значение '0' отключает таймаут."
 
 #. Type: boolean
@@ -628,7 +645,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -654,7 +671,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -667,13 +684,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -697,8 +712,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -718,12 +734,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -735,20 +756,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -782,8 +831,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -796,8 +845,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -811,7 +860,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -842,13 +891,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Максимально разрешённая длина потока (в Мб):"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "Значение '0' отключает это ограничение."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -906,6 +948,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "Значение '0' отключает это ограничение."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Разрешить сканирование архивов RAR?"
 
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 5ca3f02..b2e839d 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav_0.93~dfsg-1_sv\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2008-07-21 14:28+0100\n"
 "Last-Translator: Martin Bagge <brother at bsnet.se>\n"
 "Language-Team: swedish <sv at li.org>\n"
@@ -559,10 +559,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -609,9 +624,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "Värdet 0 stänger av denna timeout."
 
 #. Type: boolean
@@ -631,7 +648,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -657,7 +674,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -670,13 +687,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -700,8 +715,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -721,12 +737,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -738,20 +759,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -785,8 +834,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -799,8 +848,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -814,7 +863,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -845,13 +894,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Max strömlängd (i Mb) tillåtet:"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "Värdet 0 stänger av storleksbegränsningen."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -909,6 +951,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "Värdet 0 stänger av storleksbegränsningen."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Vill du aktivera skanning av RAR-arkiv?"
 
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 54474a2..d6c8c11 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -478,10 +478,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -521,8 +536,10 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
-msgid "Value of 0 disables the timeout."
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
+msgid "Set to a value of '0' to disable the timeout."
 msgstr ""
 
 #. Type: boolean
@@ -542,7 +559,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -568,7 +585,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -581,13 +598,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -611,8 +626,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -632,12 +648,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -649,20 +670,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -696,8 +745,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -710,8 +759,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -725,7 +774,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -755,12 +804,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr ""
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-msgid "Value of 0 disables the limit."
-msgstr ""
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
diff --git a/debian/po/vi.po b/debian/po/vi.po
index fcd3e9e..24f08be 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clamav 0.91.2-4\n"
-"Report-Msgid-Bugs-To: clamav at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-25 16:04+0100\n"
+"Report-Msgid-Bugs-To: pkg-clamav-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2009-03-25 20:33+0100\n"
 "PO-Revision-Date: 2007-10-16 22:14+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -235,10 +235,10 @@ msgid ""
 "etc/clamav/clamd.conf will be respected."
 msgstr ""
 "Chưa cấu hình thì phần mềm ClamAV không hoạt động được. Không cấu hình tự "
-"động thì bạn cần phải tự cấu hình « /etc/clamav/clamd.conf », hoặc chạy lệnh « "
-"dpkg-reconfigure clamav-base » về sau. Trong mọi trường hợp đều, phần mềm sẽ "
-"thực hiện mỗi thay đổi tự làm trong tập tin cấu hình « /etc/clamav/clamd.conf "
-"»."
+"động thì bạn cần phải tự cấu hình « /etc/clamav/clamd.conf », hoặc chạy lệnh "
+"« dpkg-reconfigure clamav-base » về sau. Trong mọi trường hợp đều, phần mềm "
+"sẽ thực hiện mỗi thay đổi tự làm trong tập tin cấu hình « /etc/clamav/clamd."
+"conf »."
 
 #. Type: select
 #. Description
@@ -295,8 +295,8 @@ msgid ""
 "Enter \"any\" to listen on every IP address configured. If you want to "
 "listen on a single address or host name, enter it here."
 msgstr ""
-"Gõ « any » (bất kỳ) để lắng nghe trên mọi địa chỉ IP được cấu hình. Muốn lắng "
-"nghe trên một địa chỉ hay tên máy riêng thì gõ nó vào đây."
+"Gõ « any » (bất kỳ) để lắng nghe trên mọi địa chỉ IP được cấu hình. Muốn "
+"lắng nghe trên một địa chỉ hay tên máy riêng thì gõ nó vào đây."
 
 #. Type: error
 #. Description
@@ -353,7 +353,8 @@ msgid ""
 "clamav-docs/clamdoc.pdf or the manpage clamscan(5)."
 msgstr ""
 "Để tìm thêm thông tin về những kho nào được hỗ trợ, xem tập tin « /usr/share/"
-"doc/clamav-docs/clamdoc.pdf », hoặc đọc trang hướng dẫn (man) « clamscan(5) »."
+"doc/clamav-docs/clamdoc.pdf », hoặc đọc trang hướng dẫn (man) « clamscan(5) "
+"»."
 
 #. Type: string
 #. Description
@@ -539,10 +540,10 @@ msgid ""
 "changes in /etc/clamav/clamav-milter.conf will be respected."
 msgstr ""
 "Chưa cấu hình thì phần mềm ClamAV không hoạt động được. Không cấu hình tự "
-"động thì bạn cần phải tự cấu hình « /etc/clamav/clamd.conf », hoặc chạy lệnh « "
-"dpkg-reconfigure clamav-base » về sau. Trong mọi trường hợp đều, phần mềm sẽ "
-"thực hiện mỗi thay đổi tự làm trong tập tin cấu hình « /etc/clamav/clamd.conf "
-"»."
+"động thì bạn cần phải tự cấu hình « /etc/clamav/clamd.conf », hoặc chạy lệnh "
+"« dpkg-reconfigure clamav-base » về sau. Trong mọi trường hợp đều, phần mềm "
+"sẽ thực hiện mỗi thay đổi tự làm trong tập tin cấu hình « /etc/clamav/clamd."
+"conf »."
 
 #. Type: string
 #. Description
@@ -553,10 +554,25 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:2001
-msgid ""
-"Possible formats are: [[unix|local]:]/path/to/file - to specify a unix "
-"domain socket inet:port@[hostname|ip-address] - to specify an ipv4 socket "
-"inet6:port@[hostname|ip-address] - to specify an ipv6 socket"
+msgid "Possible formats are:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "Unix domain socket: [[unix|local]:]/path/to/file"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv4 socket: inet:port@[hostname|ip-address]"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:2001
+msgid "IPv6 socket: inet6:port@[hostname|ip-address]"
 msgstr ""
 
 #. Type: boolean
@@ -604,9 +620,11 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../clamav-milter.templates:6001
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:6001 ../clamav-milter.templates:21001
 #, fuzzy
-msgid "Value of 0 disables the timeout."
+msgid "Set to a value of '0' to disable the timeout."
 msgstr "Gõ « 0 » thì tắt quá hạn."
 
 #. Type: boolean
@@ -626,7 +644,7 @@ msgstr ""
 #: ../clamav-milter.templates:8001
 msgid ""
 "Chrooting is performed just after reading the config file and before "
-"dropping privileges. An empty values means don't chroot."
+"dropping privileges. An empty value means don't chroot."
 msgstr ""
 
 #. Type: string
@@ -652,7 +670,7 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../clamav-milter.templates:10001
-msgid " Default: system specific (usually /tmp or /var/tmp)."
+msgid " If unset, $TMPDIR and $TEMP will be honored."
 msgstr ""
 
 #. Type: string
@@ -665,13 +683,11 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:11001
 msgid ""
-"Syntax: unix:path tcp:host:port The first syntax specifies a local unix "
-"socket (needs an bsolute path) e.g.:\n"
-"    unix:/var/run/clamd/clamd.socket\n"
-"The second syntax specifies a tcp local or remote tcp socket: the host can "
-"be a hostname or an ip address; the \":port\" field is only required for "
-"IPv6 addresses, otherwise it defaults to 3310\n"
-"    tcp:192.168.0.1"
+"To refer to a local unix socket using a absolute path, use unix:path (e.g., "
+"unix:/var/run/clamd/clamd.socket). A local or remote TCP socket is specified "
+"using the tcp:host:port syntax. The host can be a hostname or an ip address; "
+"the \":port\" field is only required for IPv6 addresses, otherwise it "
+"defaults to 3310 (e.g., tcp:192.168.0.1)."
 msgstr ""
 
 #. Type: string
@@ -695,8 +711,9 @@ msgstr ""
 msgid ""
 "Messages originating from these hosts/networks will not be scanned.  This "
 "option takes a host(name)/mask pair in CIRD notation and can be repeated "
-"several times. If \"/mask\" is omitted, a host is assumed.  To specify a "
-"locally orignated, non-smtp, email use the keyword \"local\"."
+"several times (separated by whitespace). If \"/mask\" is omitted, a host is "
+"assumed.  To specify a locally originated, non-smtp, email use the keyword "
+"\"local\"."
 msgstr ""
 
 #. Type: string
@@ -716,12 +733,17 @@ msgstr ""
 #: ../clamav-milter.templates:13001
 msgid ""
 "This option specifies a file which contains a list of POSIX regular "
-"expressions. Addresses (sent to or from - see below) matching these regexes "
-"will not be scanned.  Optionally each line can start with the string \"From:"
-"\" or \"To:\" (note: no whitespace after the colon) indicating if it is, "
-"respectively, the sender or recipient that is to be whitelisted.  If the "
-"field is missing, \"To:\" is assumed. Lines in this file starting with #, : "
-"or ! are ignored."
+"expressions. Addresses (sent to or from) matching these regexes will not be "
+"scanned.  Optionally each line can start with the string \"From:\" or \"To:"
+"\" (note: no whitespace after the colon) indicating if it is, respectively, "
+"the sender or recipient that is to be whitelisted.  If the field is missing, "
+"\"To:\" is assumed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../clamav-milter.templates:13001
+msgid "Lines in this file starting with #, : or ! are ignored."
 msgstr ""
 
 #. Type: select
@@ -733,20 +755,48 @@ msgstr ""
 #. Type: select
 #. Description
 #: ../clamav-milter.templates:14001
+msgid "The following actions are available:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Accept: The message is accepted for delievery"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
 msgid ""
-"The following group of options controls the delievery process under "
-"different circumstances. The following actions are available: - Accept\n"
-"  The message is accepted for delievery\n"
-"- Reject\n"
-"  Immediately refuse delievery (a 5xx error is returned to the peer)\n"
-"- Defer\n"
-"  Return a temporary failure message (4xx) to the peer\n"
-"- Blackhole (not available for OnFail)\n"
-"  Like accept but the message is sent to oblivion\n"
-"- Quarantine (not available for OnFail)\n"
-"  Like accept but message is quarantined instead of being delivered\n"
-"  In sendmail the quarantine queue can be examined via mailq -qQ\n"
-"  For Postfix this causes the message to be accepted but placed on hold"
+"- Reject: Immediately refuse delievery (a 5xx error is returned to the peer)"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid "- Defer: Return a temporary failure message (4xx) to the peer"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Blackhole (not available for OnFail): Like accept but the message is sent "
+"to\n"
+"  oblivion"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../clamav-milter.templates:14001
+msgid ""
+"- Quarantine (not available for OnFail): Like accept but message is "
+"quarantined\n"
+"  instead of being delivered In sendmail the quarantine queue can be "
+"examined\n"
+"  via mailq -qQ For Postfix this causes the message to be accepted but "
+"placed\n"
+"  on hold"
 msgstr ""
 
 #. Type: select
@@ -780,8 +830,8 @@ msgstr ""
 #: ../clamav-milter.templates:17001
 #, no-c-format
 msgid ""
-"It is therefore only useful together with \"OnInfected Reject\". The string "
-"\"%v\", if present, will be replaced with the virus name."
+"It is only useful together with \"OnInfected Reject\".  The string \"%v\", "
+"if present, will be replaced with the virus name."
 msgstr ""
 
 #. Type: boolean
@@ -794,8 +844,8 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:18001
 msgid ""
-"If adding headers is enabled, an \"X-Virus-Scanned\" and an \"X-Virus-Status"
-"\" headers will be attached to each processed message, possibly replacing "
+"If adding headers is enabled, \"X-Virus-Scanned\" and \"X-Virus-Status\" "
+"headers will be attached to each processed message, possibly replacing "
 "existing headers."
 msgstr ""
 
@@ -809,7 +859,7 @@ msgstr ""
 #. Description
 #: ../clamav-milter.templates:19001
 msgid ""
-"LogFile must be writable for the user running daemon. A full path is "
+"LogFile must be writable for the user running daemon.  A full path is "
 "required."
 msgstr ""
 
@@ -840,13 +890,6 @@ msgstr ""
 msgid "Maximum size of the log file (unit Mb):"
 msgstr "Cho phép chiều dài luồng tối đa (theo Mb):"
 
-#. Type: string
-#. Description
-#: ../clamav-milter.templates:21001
-#, fuzzy
-msgid "Value of 0 disables the limit."
-msgstr "Gõ giá trị « 0 » thì tắt sự hạn chế này."
-
 #. Type: boolean
 #. Description
 #: ../clamav-milter.templates:22001
@@ -904,6 +947,10 @@ msgstr ""
 msgid "Make sure this value is lower than StreamMaxLength in clamd.conf"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Value of 0 disables the limit."
+#~ msgstr "Gõ giá trị « 0 » thì tắt sự hạn chế này."
+
 #~ msgid "Do you want to enable RAR archive scanning?"
 #~ msgstr "Bạn có muốn hiệu lực quét kho RAR không?"
 
@@ -1010,8 +1057,8 @@ msgstr ""
 #~ "không có quyền truy cập đặc biệt. Cấu hình trước nhờ một ổ cắm hay PID "
 #~ "trong « /var/run » thì trình clam sẽ không khởi chạy lại sau lần nâng cấp "
 #~ "này. Hãy chạy lệnh cấu hình lại « dpkg-reconfigure clamav-base », và khi "
-#~ "được nhắc với ổ cắm, thay đổi vị trí của nó thành « /var/run/clamav/ », và "
-#~ "cập nhật cấu hình của phần mềm nào cũng sử dụng ổ cắm này (v.d. Exim, "
+#~ "được nhắc với ổ cắm, thay đổi vị trí của nó thành « /var/run/clamav/ », "
+#~ "và cập nhật cấu hình của phần mềm nào cũng sử dụng ổ cắm này (v.d. Exim, "
 #~ "AMaVis)."
 
 #~ msgid "daemon, ifup.d, cron, manual"

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list