Re: Please update debconf PO translation for the package exim4 4.67-1exp1
> Wouldn't it make sense to say whether these changes were in English style
> only? I've got 19 fuzzy translations now, and no diff between the old and
> the new English text, so I have to re-read all of them to find if there are
> any subtle differences. That's tedious.
I'm really sorry for this. In the usual process, *I* am doing all
changes in a local tree, then I submit the result to the maintainer.
That includes using new gettext features that put former msgid's in
the changed strings comments.
However, for exim4, the maintainer applied the changes to his
experimental branch *before* that. As he did not apply all the
suggested changes, I have to follow him and post the call for updates
by using the same copy. And, unfortunately, he did *not* use the new
"msgmerge --previous" feature, so you don't have former msgid's in the
strings comments.
Hopefully, that should happen only for exim4.
Please find attached the diff between the former strings and the new
ones. Hopefully, that may help you and other translators.
--- /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4.old/debian/exim4-base.templates 2007-05-13 08:18:23.702408063 +0200
+++ /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4/debian/exim4-base.templates 2007-06-07 22:52:51.920693395 +0200
@@ -2,32 +2,30 @@
Type: boolean
Default: false
_Description: Remove undelivered mails in spool directory?
- There are mails in the exim spool directory /var/spool/exim4/input which
+ There are mails in the Exim spool directory /var/spool/exim4/input/ which
have not yet been delivered. Removing Exim will cause them to remain
undelivered until Exim is re-installed.
.
If this option is not chosen, the spool directory is kept, allowing
the messages in the queue to be delivered at a later date after
- re-installing Exim.
+ Exim is re-installed.
Template: exim4/move_exim3_spool
Type: boolean
Default: false
-_Description: Move undelivered mails from exim(v3) to exim4 spool?
- There are some undelivered mails in exim(v3) (or exim-tls(v3)) spool
+_Description: Move undelivered mails from exim 3 to exim4 spool?
+ There are some undelivered mails in exim 3 (or exim-tls 3) spool
directory /var/spool/exim/input/.
.
Choosing this option will move these messages to exim4's spool
(/var/spool/exim4/input/) where they will be handled by exim4.
.
- This works only one-way: Exim4 can handle exim(v3) spool but not
- vice-versa. You should move the messages only if you do not plan
- to go back to exim(v3). Otherwise, the messages should be moved manually
- at a later time.
+ This works only one-way: Exim4 can handle Exim 3 spool but not
+ vice-versa. If you reject this option, you need to move the messages
+ yourself or they will never be delivered.
Template: exim4-base/drec
-Type: note
+Type: error
_Description: Reconfigure exim4-config instead of this package
Exim4 has its configuration factored out into a dedicated package,
- exim4-config. If you want to reconfigure Exim4, use dpkg-reconfigure
- exim4-config.
+ exim4-config. To reconfigure Exim4, use 'dpkg-reconfigure exim4-config'.
--- /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4.old/debian/exim4-config.templates 2007-05-13 08:18:23.702408063 +0200
+++ /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4/debian/exim4-config.templates 2007-06-07 22:10:18.550392089 +0200
@@ -12,7 +12,7 @@
Please select the mail server configuration type that best meets your needs.
.
Systems with dynamic IP addresses, including dialup systems, should generally
- be configured to send outgoing mail to another machine, called a "smarthost"
+ be configured to send outgoing mail to another machine, called a 'smarthost'
for delivery because many receiving systems on the Internet block
incoming mail from dynamic IP addresses as spam protection.
.
@@ -25,19 +25,19 @@
_Description: Really leave the mail system unconfigured?
Until the mail system is configured, it will be broken and cannot be
used. Configuration at a later time can be done either by hand or by
- running "dpkg-reconfigure exim4-config" as root.
+ running 'dpkg-reconfigure exim4-config' as root.
Template: exim4/mailname
Type: string
_Description: System mail name:
- The "mail name" is the domain name used to "qualify" mail addresses
+ The 'mail name' is the domain name used to 'qualify' mail addresses
without a domain name.
.
This name will also be used by other programs. It should be the
- single, full domain name (FQDN).
+ single, fully qualified domain name (FQDN).
.
- For example, if a mail address on the local host is foo@domain.example,
- then the correct value for this option would be domain.example.
+ Thus, if a mail address on the local host is foo@example.org,
+ the correct value for this option would be example.org.
.
This name won't appear on From: lines of outgoing mails if rewriting
is enabled.
@@ -47,11 +47,9 @@
Default:
_Description: Other destinations for which mail is accepted:
Please enter a semicolon-separated list of recipient domains for
- which this machine should consider itself the final destination,
- apart from the local hostname (${fqdn}) and "localhost". These
- domains are commonly called "local domains".
- .
- Leaving this list blank will have Exim do no local deliveries.
+ which this machine should consider itself the final destination.
+ These domains are commonly called 'local domains'. The local hostname
+ ({fqdn}) and 'localhost' are always added to the list given here.
.
By default all local domains will be treated identically. If both
a.example and b.example are local domains, acc@a.example and
@@ -76,7 +74,7 @@
Default:
_Description: Machines to relay mail for:
Please enter a semicolon-separated list of IP address ranges for
- which this system will arbitrarily relay mail, functioning as a
+ which this system will unconditionally relay mail, functioning as a
smarthost.
.
You should use the standard address/prefix format (e.g. 194.222.242.0/24
@@ -108,7 +106,7 @@
Template: exim4/dc_postmaster
Type: string
_Description: Root and postmaster mail recipient:
- Mail for the "postmaster", "root", and other system accounts needs to
+ Mail for the 'postmaster', 'root', and other system accounts needs to
be redirected to the user account of the actual system administrator.
.
If this value is left empty, such mail will be saved in /var/mail/mail,
@@ -117,9 +115,9 @@
Note that postmaster's mail should be read on the system to which it is
directed, rather than being forwarded elsewhere, so (at least one of)
the users listed here should not redirect their mail off this machine.
- A "real-" prefix can be used to force local delivery.
+ A 'real-' prefix can be used to force local delivery.
.
- Multiple usernames need to be separated by spaces.
+ Multiple user names need to be separated by spaces.
Template: exim4/dc_noalias_regenerate
Type: boolean
@@ -141,7 +139,7 @@
An empty value will cause Exim to listen for connections on all
available network interfaces.
.
- If this system does only receive mail directly from local services like
+ If this system only receives mail directly from local services like
fetchmail or your mail program (MUA) talking to localhost (and not
from other hosts), it is advisable to prohibit external connections to
the local Exim. This can be accomplished by entering 127.0.0.1 here.
@@ -172,9 +170,9 @@
Template: exim4/use_split_config
Type: boolean
_Description: Split configuration into small files?
- The Debian exim4 packages can either use "unsplit configuration", a
- single monolithic file (/etc/exim4/exim4.conf.template) or "split
- configuration", where the actual Exim configuration files are built
+ The Debian exim4 packages can either use 'unsplit configuration', a
+ single monolithic file (/etc/exim4/exim4.conf.template) or 'split
+ configuration', where the actual Exim configuration files are built
from about 50 smaller files in /etc/exim4/conf.d/.
.
Unsplit configuration is better suited for large modifications and is
@@ -190,7 +188,7 @@
_Description: Hide local mail name in outgoing mail?
The headers of outgoing mail can be rewritten to make it appear to have been
generated on a different system. If this option is chosen,
- "${mailname}", "localhost" and "${dc_other_hostnames}" in From, Reply-To,
+ '${mailname}', 'localhost' and '${dc_other_hostnames}' in From, Reply-To,
Sender and Return-Path are rewritten.
Template: exim4/dc_localdelivery
--- /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4.old/debian/exim4-daemon-heavy.templates 2007-05-13 08:18:23.702408063 +0200
+++ /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4/debian/exim4-daemon-heavy.templates 2007-06-07 22:52:40.421266775 +0200
@@ -1,6 +1,5 @@
Template: exim4-daemon-heavy/drec
-Type: note
+Type: error
_Description: Reconfigure exim4-config instead of this package
Exim4 has its configuration factored out into a dedicated package,
- exim4-config. If you want to reconfigure Exim4, use dpkg-reconfigure
- exim4-config.
+ exim4-config. To reconfigure Exim4, use 'dpkg-reconfigure exim4-config'.
--- /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4.old/debian/exim4-daemon-light.templates 2007-05-13 08:18:23.770408594 +0200
+++ /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4/debian/exim4-daemon-light.templates 2007-06-07 22:52:36.421466262 +0200
@@ -1,6 +1,5 @@
Template: exim4-daemon-light/drec
-Type: note
+Type: error
_Description: Reconfigure exim4-config instead of this package
Exim4 has its configuration factored out into a dedicated package,
- exim4-config. If you want to reconfigure Exim4, use dpkg-reconfigure
- exim4-config.
+ exim4-config. To reconfigure Exim4, use 'dpkg-reconfigure exim4-config'.
--- /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4.old/debian/exim4.templates 2007-05-13 08:18:23.590407188 +0200
+++ /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4/debian/exim4.templates 2007-06-07 22:52:22.922139721 +0200
@@ -2,5 +2,4 @@
Type: error
_Description: Reconfigure exim4-config instead of this package
Exim4 has its configuration factored out into a dedicated package,
- exim4-config. If you want to reconfigure Exim4, use "dpkg-reconfigure
- exim4-config".
+ exim4-config. To reconfigure Exim4, use 'dpkg-reconfigure exim4-config'.
--- /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4.old/debian/control 2007-05-13 08:18:23.654407688 +0200
+++ /home/bubulle/travail/debian/rewrite/TRANS/exim4/exim4/debian/control 2007-06-07 22:10:18.550392089 +0200
@@ -12,9 +12,9 @@
Conflicts: exim, exim-tls, exim4-daemon-light (<<${Upstream-Version}), exim4-daemon-heavy (<<${Upstream-Version}), exim4-daemon-custom (<<${Upstream-Version})
Replaces: exim, exim-tls, exim4-daemon-light, exim4-daemon-heavy, exim4-daemon-custom
Depends: ${shlibs:Depends}, ${misc:Depends}, cron (>=3.0pl1-42), exim4-config (>=4.30) | exim4-config-2, adduser, netbase, lsb-base (>= 3.0-3)
-Recommends: psmisc
+Recommends: psmisc, mailx
Suggests: mail-reader, eximon4, exim4-doc-html|exim4-doc-info, gnutls-bin | openssl, file, libmail-spf-query-perl (>= 1.999-1)
-Description: support files for all exim MTA (v4) packages
+Description: support files for all Exim MTA (v4) packages
Exim (v4) is a mail transport agent. exim4-base provides the support
files needed by all exim4 daemon packages. You need an additional package
containing the main executable. The available packages are:
@@ -41,9 +41,7 @@
can find the subscription web page on
http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
.
- exim is a drop-in replacement for sendmail/mailq/rsmtp.
- .
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Package: exim4-config
Architecture: all
@@ -51,7 +49,7 @@
Provides: exim4-config-2
Conflicts: exim, exim-tls, exim4-config, exim4-config-2, bash (<< 2.05), exim4-daemon-light (<<4.63), exim4-daemon-heavy (<<4.63), ${MTA-Conflicts}
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Description: configuration for the exim MTA (v4)
+Description: configuration for the Exim MTA (v4)
Exim (v4) is a mail transport agent. exim4-config provides the configuration
for the exim4 daemon packages. The configuration framework has been split
off the main package to allow sites to replace the configuration scheme
@@ -79,18 +77,16 @@
can find the subscription web page on
http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
.
- exim is a drop-in replacement for sendmail/mailq/rsmtp.
- .
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Package: exim4-daemon-light
Architecture: any
Priority: standard
-Provides: mail-transport-agent
+Provides: mail-transport-agent, exim4-localscanapi-1.0, exim4-localscanapi-1.1
Conflicts: mail-transport-agent
Replaces: mail-transport-agent, exim4-base (<= 4.61-1)
Depends: exim4-base (>= ${Upstream-Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: lightweight exim MTA (v4) daemon
+Description: lightweight Exim MTA (v4) daemon
Exim (v4) is a mail transport agent. This package contains the exim4
daemon with only basic features enabled. It works well with the
standard setups that are provided by Debian and includes support for
@@ -113,16 +109,14 @@
can find the subscription web page on
http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
.
- exim is a drop-in replacement for sendmail/mailq/rsmtp.
- .
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Package: exim4
Architecture: all
Priority: standard
Depends: ${misc:Depends}, debconf (>= 1.4.69) | cdebconf (>= 0.39), exim4-base (>= ${Upstream-Version}), exim4-daemon-light | exim4-daemon-heavy | exim4-daemon-custom
-Description: metapackage to ease exim MTA (v4) installation
- Exim (v4) is a mail transport agent. exim4 is the metapackage depending
+Description: meta-package to ease Exim MTA (v4) installation
+ Exim (v4) is a mail transport agent. exim4 is the meta-package depending
on the essential components for a basic exim4 installation.
.
The Debian exim4 packages have their own web page,
@@ -141,18 +135,16 @@
can find the subscription web page on
http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
.
- exim is a drop-in replacement for sendmail/mailq/rsmtp.
- .
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Package: exim4-daemon-heavy
Architecture: any
Priority: optional
-Provides: mail-transport-agent
+Provides: mail-transport-agent, exim4-localscanapi-1.0, exim4-localscanapi-1.1
Conflicts: mail-transport-agent
Replaces: mail-transport-agent, exim4-base (<= 4.61-1)
Depends: exim4-base (>= ${Upstream-Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: exim MTA (v4) daemon with extended features, including exiscan-acl
+Description: Exim MTA (v4) daemon with extended features, including exiscan-acl
Exim (v4) is a mail transport agent. This package contains the exim4
daemon with extended features. In addition to the features already
supported by exim4-daemon-light, exim4-daemon-heavy includes LDAP,
@@ -177,18 +169,16 @@
can find the subscription web page on
http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
.
- exim is a drop-in replacement for sendmail/mailq/rsmtp.
- .
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Package: exim4-daemon-custom
Architecture: any
Priority: optional
-Provides: mail-transport-agent
+Provides: mail-transport-agent, exim4-localscanapi-1.0, exim4-localscanapi-1.1
Conflicts: mail-transport-agent
Replaces: mail-transport-agent, exim4-base (<= 4.61-1)
Depends: exim4-base (>= ${Upstream-Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: custom exim MTA (v4) daemon with locally set features
+Description: custom Exim MTA (v4) daemon with locally set features
Exim (v4) is a mail transport agent. This package contains a
custom-configured exim4 daemon compiled to local needs. This package
is not part of official Debian, but can easily be built from the
@@ -211,9 +201,7 @@
can find the subscription web page on
http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
.
- exim is a drop-in replacement for sendmail/mailq/rsmtp.
- .
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Package: eximon4
Architecture: any
@@ -221,20 +209,20 @@
Conflicts: eximon
Replaces: eximon
Depends: ${shlibs:Depends}, exim4-base (>= 4.10)
-Description: monitor application for the exim MTA (v4) (X11 interface)
- Eximon is a helper program for the exim MTA (v4). It allows
+Description: monitor application for the Exim MTA (v4) (X11 interface)
+ Eximon is a helper program for the Exim MTA (v4). It allows
administrators to view the mail queue and logs, and perform a variety
of actions on queued messages, such as freezing, bouncing and thawing
messages.
.
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Package: exim4-dbg
Architecture: any
Priority: extra
Depends: exim4-base, exim4-config, eximon4
-Description: debugging symbols for the exim MTA (v4) packages
- Exim (v4) is a mail transport agent. This package contains dbg
+Description: debugging symbols for the Exim MTA (v4) packages
+ Exim (v4) is a mail transport agent. This package contains
debugging symbols for the binaries contained in the exim4
packages. The daemon packages have their own debug package.
.
@@ -254,16 +242,14 @@
can find the subscription web page on
http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
.
- exim is a drop-in replacement for sendmail/mailq/rsmtp.
- .
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Package: exim4-daemon-light-dbg
Architecture: any
Priority: extra
Depends: exim4-daemon-light
-Description: debugging symbols for the exim MTA (v4) packages
- Exim (v4) is a mail transport agent. This package contains dbg
+Description: debugging symbols for the Exim MTA (v4) packages
+ Exim (v4) is a mail transport agent. This package contains
debugging symbols for the binaries contained in the
exim4-daemon-light package.
.
@@ -283,16 +269,14 @@
can find the subscription web page on
http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
.
- exim is a drop-in replacement for sendmail/mailq/rsmtp.
- .
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Package: exim4-daemon-heavy-dbg
Architecture: any
Priority: extra
Depends: exim4-daemon-heavy
-Description: debugging symbols for the exim MTA (v4) packages
- Exim (v4) is a mail transport agent. This package contains dbg
+Description: debugging symbols for the Exim MTA (v4) packages
+ Exim (v4) is a mail transport agent. This package contains
debugging symbols for the binaries contained in the
exim4-daemon-heavy package.
.
@@ -312,16 +296,14 @@
can find the subscription web page on
http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
.
- exim is a drop-in replacement for sendmail/mailq/rsmtp.
- .
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Package: exim4-daemon-custom-dbg
Architecture: any
Priority: extra
Depends: exim4-daemon-custom
-Description: debugging symbols for the exim MTA (v4) packages
- Exim (v4) is a mail transport agent. This package contains dbg
+Description: debugging symbols for the Exim MTA (v4) packages
+ Exim (v4) is a mail transport agent. This package contains
debugging symbols for the binaries contained in the
exim4-daemon-custom package.
.
@@ -341,14 +323,12 @@
can find the subscription web page on
http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
.
- exim is a drop-in replacement for sendmail/mailq/rsmtp.
- .
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Package: exim4-dev
Architecture: any
Priority: extra
-Description: header files for the exim MTA (v4) packages
+Description: header files for the Exim MTA (v4) packages
Exim (v4) is a mail transport agent. This package contains header
files that can be used to compile code that is then dynamically linked
to exim's local_scan interface.
@@ -369,6 +349,4 @@
can find the subscription web page on
http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
.
- exim is a drop-in replacement for sendmail/mailq/rsmtp.
- .
- Upstream URL: http://www.exim.org/
+ Homepage: http://www.exim.org/
Reply to: