diff options
| author | Julien Valroff <julien@kirya.net> | 2010-10-23 14:11:22 +0200 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2011-03-13 18:30:14 +0100 |
| commit | 6ae50dc1afce089ecf5595fdd13a088afe2886ca (patch) | |
| tree | 3d3feb4f9c122b6542cb0ce8cc5750a19582a9e0 | |
| parent | 44962f21cbc5c9de2482c61b7b1cce1b81812eaa (diff) | |
Imported Debian patch 1.14-1.4squeeze1debian/1.14-1.4squeeze1
57 files changed, 806 insertions, 1374 deletions
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 845ca06..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pc diff --git a/debian/README.Debian b/debian/README.Debian index 931689c..f80acf8 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,5 +1,7 @@ -README.Debian for mailgraph -============================ +Mailgraph gathers statistics about traffic passing through a Postfix +mail server and presents them in graphical form on a web page. It does +this using the excellent RRDTOOL +(http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/). This Debian package installs itself, optionally, as a daemon that will constantly gather the statistics it needs. You really need to turn @@ -8,17 +10,4 @@ served up by a web CGI program, /usr/lib/cgi-bin/mailgraph.cgi. With any normal Debian web server install, this should be accessible as http://localhost/cgi-bin/mailgraph.cgi - -Note for Lighttpd users: - - Lighttpd doesn't take *.cgi? values, hence the graphs are not displayed - without extra configuration. - An example of such configuration is available in - /usr/share/doc/mailgraph/examples/lighttpd.conf - - It should be amended to suit your needs, and copied to eg. - /etc/lighttpd/conf-available/50-mailgraph.conf - - -- Norbert Tretkowski <nobse@debian.org> Thu, 25 Dec 2003 23:50:13 +0100 - -- Julien Valroff <julien@kirya.net> Sat, 06 Nov 2010 11:07:08 +0100 diff --git a/debian/changelog b/debian/changelog index 88cbd8e..94e68cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,123 +1,38 @@ -mailgraph (1.14-8~bpo60+1) squeeze-backports; urgency=low - - * Rebuild for squeeze-backports - - -- Julien Valroff <julien@debian.org> Sat, 05 Mar 2011 20:30:27 +0100 - -mailgraph (1.14-8) unstable; urgency=low - - * Add patch from Malte S. Stretz to replace rrdtool badge by a simple - text link which prevents tracking by oss.oetiker.ch - * Bump debhelper compat to 8 - - -- Julien Valroff <julien@debian.org> Sat, 12 Feb 2011 15:11:19 +0100 - -mailgraph (1.14-7) unstable; urgency=low - - * Make use of perl:Depends substvar - * Update copyright information as per latest DEP-5 - * Add patch from Adrian von Bidder <avbidder@fortytwo.ch> to fix virus - notification with clamav-milter (Closes: #610521) - - -- Julien Valroff <julien@debian.org> Wed, 19 Jan 2011 18:28:20 +0100 - -mailgraph (1.14-6) unstable; urgency=low - - * Debconf templates translation update: - + nl - thanks to Remco Rijnders (Closes: #600552) - * Remove duplicate description from README.Debian - * Update my email address - * Remove DMUA field, now useless - - -- Julien Valroff <julien@debian.org> Wed, 10 Nov 2010 21:46:34 +0100 - -mailgraph (1.14-5) unstable; urgency=low - - * l10n update upload: - + ja - thanks to Hideki Yamane (Closes: #599885) - + sv - thanks to Martin Bagge (Closes: #599898) - + sk - thanks to Ivan Masár (Closes: #599907) - + ru - thanks to Yuri Kozlov (Closes: #599935) - + eu - thanks to Iñaki Larrañaga Murgoitio (Closes: #599942) - + da - thanks to Joe Hansen (Closes: #600096) - - -- Julien Valroff <julien@kirya.net> Sun, 17 Oct 2010 18:32:07 +0200 - -mailgraph (1.14-4) unstable; urgency=low - - * Recommend apache2 instead of apache - * Add the CSS directly into the CGI script (Closes: #513527) - * Update debconf templates translations: - + de - thanks to Martin Eberhard Schauer (Closes: #593570) - + it - thanks to Luca Monducci (Closes: #593719) - + es - thanks to Ricardo Fraile (Closes: #597066) - + cs - thanks to Miroslav Kure (Closes: #598348) - * Add versioned pre-dependency on debconf - * Use ucf to deal with conffile (thanks to Matthijs Möhlmann) - * Make sure to merge debconf and default values (Closes: #597066) - * Re-merged new and updated debconf templates translations, - part of Christian Perrier's last NMU's: - + da - thanks to Joe Hansen - + fi - thanks to Esko Arajärvi - + ja - thanks to Hideki Yamane - + ru - thanks to Yuri Kozlov - + sk - thanks to Ivan Masár - + sv - thanks to Martin Bagge - * Fix typo in watch file - - -- Julien Valroff <julien@kirya.net> Sat, 09 Oct 2010 20:54:02 +0200 - -mailgraph (1.14-3) unstable; urgency=low - - * Update debconf templates translations: - + pt - thanks to Américo Monteiro (Closes: #592654) - + fr - thanks to Christian Perrier (Closes: #592825) - * Add example configuration file for lighttpd and add - a note in README.Debian about it (Closes: #568210) - * Ensure all files are correclty cleaned after build - - -- Julien Valroff <julien@kirya.net> Fri, 13 Aug 2010 14:12:38 +0200 - -mailgraph (1.14-2) unstable; urgency=low - - * Take over package maintenance, thanks to Norbert for his previous work - * Bump debhelper compat to 7 - * Bump Standards version to 3.9.1 - * Add DM-Upload-Allowed field - * Add Homepage field - * Switched from dpatch to quilt - * Convert to 3.0 (quilt) format - * Use dh minimal rules - * Update copyright information and switch for machine-readble format - * Add manpage, thanks to Gregory Colpart <reg@evolix.fr> - (Closes: #189033, #462294) - * Add watch file (Closes: #489719) - * Add patch to account for infected mail as logged by DSPAM - (Closes: #370091) - * Allow extra options to be passed to mailgraph through default file - (Closes: #311437, #258980) - * Complete rewrite of the postinst script - (Closes: #513634, #337923, #283664, #343726) - * Add ${misc:Depends} to the dependencies - * Make sure the rrd directory has the correct ownership - * Add mailgraph.css to the package (Closes: #513527) - * Rewrite of the init script using lsb functions: - + Call mailgraph with --daemon_pid option (Closes: #508786) - + Make sure the rrd dir is writable by the HTTP daemon (Closes: #543900) - * Rewrite both short and long descriptions to state Exim and Sendmail - are also supported (Closes: #469257) - * Add recommends for an MTA - * Add patch to allow mailgraph.cgi to show graph if the script is renamed - (Closes: #434486) - * Improve debconf template for IGNORE_LOCALHOST option - * Update Debconf templates translation: - + ja - thanks to Hidekia Yamane (Closes: #564234) - + sv - thanks to Martin Bagge (Closes: #564127) - + sk - thanks to helix84 (Closes: #564099) - + ru - thanks to Yuri Kozlov (Closes: #564081) - + vi - thanks to Clytie Siddall <clytie@riverland.net.au> - - -- Julien Valroff <julien@kirya.net> Thu, 11 Feb 2010 20:19:09 +0100 +mailgraph (1.14-1.4squeeze1) testing-proposed-updates; urgency=low + + * Change maintainer field to myself + * Update Finnish Debconf translation (Esko Arajärvi) (Closes: #595609) + + -- Julien Valroff <julien@kirya.net> Sat, 23 Oct 2010 14:11:22 +0200 + +mailgraph (1.14-1.4) unstable; urgency=low + + * Non-maintainer upload. + * Fix pending l10n issues. Debconf translations: + - Swedish (Martin Bagge). Closes: #572582 + - Danish (Joe Hansen). Closes: #586224 + + -- Christian Perrier <bubulle@debian.org> Sun, 20 Jun 2010 14:01:50 +0200 + +mailgraph (1.14-1.3) unstable; urgency=low + + * Non-maintainer upload. + * Bump debhelper compatibility level to 7 + * As a consequence, replace "dh_clean -k" by dh_prep in debian/rules + * Add ${misc:Depends} to binary package dependencies to properly + cope with dependencies triggerred by debhelper + * Fix pending l10n issues. Debconf translations: + - Russian (Yuri Kozlov). Closes: #564081, #571477 + - Slovak (Ivan Masár). Closes: #564099, #571223 + - Swedish (Martin Bagge). Closes: #564127 + - Japanese (Hideki Yamane (Debian-JP)). Closes: #564234, #571547 + - Finnish (Esko Arajärvi). Closes: #564491 + - Italian (Luca Monducci). Closes: #564948, #571963 + - German (Thomas Mueller). Closes: #565200, #571954 + - Spanish (Francisco Javier Cuadrado). Closes: #565247, #571306 + - Czech (Miroslav Kure). Closes: #565879, #572346 + + -- Christian Perrier <bubulle@debian.org> Thu, 04 Mar 2010 08:47:03 +0100 mailgraph (1.14-1.2) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 45a4fb7..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +7 diff --git a/debian/mailgraph.config b/debian/config index e82140c..0e5107b 100644 --- a/debian/mailgraph.config +++ b/debian/config @@ -1,20 +1,16 @@ -#!/bin/sh - -set -e - +#!/bin/sh -e . /usr/share/debconf/confmodule -db_title "mailgraph" || true - -# Sync debconf values with the local configuration -if [ -r /etc/default/mailgraph ]; then +if [ -f /etc/default/mailgraph ]; then . /etc/default/mailgraph db_set mailgraph/start_on_boot "$BOOT_START" db_set mailgraph/mail_log "$MAIL_LOG" db_set mailgraph/ignore_localhost "$IGNORE_LOCALHOST" fi - + db_input medium mailgraph/start_on_boot || true +db_go db_input medium mailgraph/mail_log || true +db_go db_input medium mailgraph/ignore_localhost || true -db_go || true +db_go diff --git a/debian/control b/debian/control index 2d221e7..a28ccb4 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,16 @@ Source: mailgraph Section: admin Priority: extra -Maintainer: Julien Valroff <julien@debian.org> -Uploaders: Norbert Tretkowski <nobse@debian.org> -Build-Depends: debhelper (>= 8), po-debconf -Standards-Version: 3.9.1 -Homepage: http://mailgraph.schweikert.ch +Maintainer: Julien Valroff <julien@kirya.net> +Build-Depends: debhelper (>= 7), dpatch, po-debconf +Standards-Version: 3.7.2.2 Package: mailgraph Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, libfile-tail-perl, librrds-perl, ucf (>= 0.28) -Pre-Depends: debconf (>= 0.5) | debconf-2.0 -Recommends: httpd | apache2, exim4 | postfix | sendmail | mail-transport-agent -Description: RRDtool frontend for Mail statistics +Depends: libfile-tail-perl, librrds-perl, ${misc:Depends} +Pre-Depends: debconf | debconf-2.0 +Recommends: httpd | apache +Description: Mail statistics RRDtool frontend for Postfix Mailgraph is a very simple mail statistics RRDtool frontend for - Postfix, Sendmail or Exim that produces daily, weekly, monthly and - yearly graphs of received/sent and bounced/rejected mail. + Postfix that produces daily, weekly, monthly and yearly graphs of + received/sent and bounced/rejected mail. diff --git a/debian/copyright b/debian/copyright index 9c4f680..a7d26ff 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,35 +1,10 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 -Upstream-Name: mailgraph -Upstream-Contact: David Schweikert <david@schweikert.ch> -Source: http://mailgraph.schweikert.ch/pub/ +This package was debianized by Norbert Tretkowski <nobse@debian.org> on +Mon, 4 Nov 2002 15:31:44 +0100. -Files: * -Copyright: 2000-2007 David Schweikert <david@schweikert.ch> - 2000-2007 ETH Zurich -License: GPL-2 +It was downloaded from http://people.ee.ethz.ch/~dws/software/mailgraph/ -Files: debian/* -Copyright: 2002-2009 Norbert Tretkowski <nobse@debian.org> - 2010-2011 Julien Valroff <julien@debian.org> -License: GPL-2 +Upstream Author: David Schweikert <david@schweikert.ch> -License: GPL-2 - This program is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation version - 2 of the License - . - This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more - details. - . - You should have received a copy of the GNU General Public - License along with this package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. +Copyright © 2000-2007 David Schweikert <david@schweikert.ch> + +License: see /usr/share/common-licenses/GPL diff --git a/debian/default.conf b/debian/default.conf deleted file mode 100644 index 72d4649..0000000 --- a/debian/default.conf +++ /dev/null @@ -1,23 +0,0 @@ -# This file is sourced by /etc/init.d/mailgraph -# -# This is a POSIX shell fragment -# - -# Should Mailgraph start on boot (true|false) (default: true) -BOOT_START="true" - -# Logfile used by mailgraph (default: /var/log/mail.log) -MAIL_LOG="/var/log/mail.log" - -# Ignore mails from localhost (true|false) (default: false) -# When true, this will pass --ignore-localhost to mailgraph daemon -IGNORE_LOCALHOST="false" - -# Extra options to be passed to mailgraph daemon -# See mailgraph -h output (default: "") -EXTRA_OPTIONS="" - -# User and group http daemon runs as (default: www-data for both options) -# Restart mailgraph daemon so that these values are taken into account -HTTP_USER="www-data" -HTTP_GROUP="www-data" diff --git a/debian/mailgraph.dirs b/debian/dirs index 5af1b35..3a4fc65 100644 --- a/debian/mailgraph.dirs +++ b/debian/dirs @@ -1,3 +1,2 @@ usr/sbin usr/lib/cgi-bin -var/lib/mailgraph diff --git a/debian/mailgraph.docs b/debian/docs index 95f19c1..95f19c1 100644 --- a/debian/mailgraph.docs +++ b/debian/docs diff --git a/debian/init b/debian/init new file mode 100644 index 0000000..cd5bdff --- /dev/null +++ b/debian/init @@ -0,0 +1,60 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: mailgraph +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Mail statistics frontend for Postfix +### END INIT INFO + +MAILGRAPH_CONFIG="/etc/default/mailgraph" +NAME="mailgraph" +DAEMON="/usr/sbin/mailgraph" +PID_FILE="/var/run/mailgraph.pid" +RRD_DIR="/var/lib/mailgraph" +IGNORE_OPTION="" + +if [ -f $MAILGRAPH_CONFIG ]; then + . $MAILGRAPH_CONFIG +else + exit 0 +fi + +test -x $DAEMON || exit 0 + +if [ "$BOOT_START" = "false" ] ; then + exit 0 +fi + +if [ "$IGNORE_LOCALHOST" = "true" ]; then + IGNORE_OPTION="--ignore-localhost" +fi + +case "$1" in + start) + echo -n "Starting Postfix Mail Statistics: $NAME" + start-stop-daemon -S -q -b -p $PID_FILE -x $DAEMON -- -l $MAIL_LOG -d --daemon_rrd=$RRD_DIR $IGNORE_OPTION + echo "." + ;; + stop) + echo -n "Stopping Postfix Mail Statistics: $NAME" + if [ -f $PID_FILE ]; then + kill `cat $PID_FILE` + rm $PID_FILE + fi + echo "." + ;; + restart) + $0 stop + $0 start + ;; + force-reload) + $0 restart + ;; + *) + echo "Usage: $0 start|stop|restart|force-reload" + exit 1 + ;; +esac diff --git a/debian/lighttpd.conf b/debian/lighttpd.conf deleted file mode 100644 index 58e8b45..0000000 --- a/debian/lighttpd.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Alias for mailgraph.cgi -# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568210 - -alias.url += ( - "/mailgraph.cgi" => "/usr/lib/cgi-bin/mailgraph.cgi", -) - -$HTTP["url"] =~ "^/mailgraph*", { - -} - diff --git a/debian/mailgraph.8 b/debian/mailgraph.8 deleted file mode 100644 index e47818d..0000000 --- a/debian/mailgraph.8 +++ /dev/null @@ -1,58 +0,0 @@ -.TH MAILGRAPH 8 -.SH NAME -mailgraph \- daemon which produces graphs of SMTP traffic -.SH SYNOPSIS -.B mailgraph -[ -.I options -] -.SH DESCRIPTION -.ad -.fi -\fBmailgraph\fR is a daemon which produces mail statistics RRDtool -for Postfix and Sendmail. This stats are stored for generating -daily, weekly, monthly and yearly graphs of sent/received/rejected -and bounced/viruses/spam mails. -.SH OPTIONS -.IP "\fB-h, --help\fR" -Display help and exit. -.IP "\fB-v, --verbose\fR" -Be verbose about what you do. -.IP "\fB-V, --version\fR" -Output version information and exit. -.IP "\fB-c, --cat\fR" -Cause the logfile to be only read and not monitored. -.IP "\fB-l, --logfile \fIfile\fR" - Monitor logfile \fIfile\fR instead of /var/log/syslog. -.IP "\fB-t, --logtype \fItype\fR" -Set logfile's \fItype\fR (default: syslog). -.IP "\fB-y, --year\fR" -Start year of the log file (default: current year). -.IP "\fB--host=\fIHOST\fR -Use only entries for \fIHOST\fR (regexp) in syslog. -.IP "\fB-d, --daemon\fR" -Start in the background -.IP "\fB--daemon-pid=\fIFILE\fR" -Write PID to \fIFILE\fR instead of /var/run/mailgraph.pid. -.IP "\fB--daemon-rrd=\fIDIR\fR" -Write RRDs to \fIDIR\fR instead of /var/log. -.IP "\fB--daemon-log=\fIFILE\fR" -Write verbose-log to \fIFILE\fR instead of /var/log/mailgraph.log. -.IP "\fB--ignore-localhost\fR" -Ignore mail to/from localhost (used for virus scanner). -.IP "\fB--ignore-host=\fIHOST\fR" -Ignore mail to/from \fIHOST\fR (used for virus scanner). -.IP "\fB--only-mail-rrd\fR" -Update only the mail rrd. -.IP "\fB--only-virus-rrd\fR" -Update only the virus rrd. -.IP "\fB--rrd-name=\fINAME\fR" -Use \fINAME\fR.rrd and \fINAME\fR_virus.rrd for the rrd files. -.IP "\fB--rbl-is-spam\fR" -Count rbl rejects as spam. -.IP "\fB--virbl-is-virus\fR" -Count virbl rejects as viruses. -.SH "SEE ALSO" -rrdtool(1), RRDs(3pm) -.SH AUTHOR -David Schweikert <dws@ee.ethz.ch> diff --git a/debian/mailgraph.examples b/debian/mailgraph.examples deleted file mode 100644 index 1c07734..0000000 --- a/debian/mailgraph.examples +++ /dev/null @@ -1 +0,0 @@ -debian/lighttpd.conf diff --git a/debian/mailgraph.init b/debian/mailgraph.init deleted file mode 100644 index f1d0c26..0000000 --- a/debian/mailgraph.init +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: mailgraph -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Mail statistics frontend for Postfix -### END INIT INFO - -MAILGRAPH_CONFIG="/etc/default/mailgraph" -NAME="mailgraph" -DAEMON="/usr/sbin/mailgraph" -PID_FILE="/var/run/mailgraph.pid" -RRD_DIR="/var/lib/mailgraph" - -# Default values -BOOT_START=true -MAIL_LOG=/var/log/mail.log -IGNORE_LOCALHOST=false -EXTRA_OPTIONS="" -HTTP_USER=www-data -HTTP_GROUP=www-data - -[ -r $MAILGRAPH_CONFIG ] && . $MAILGRAPH_CONFIG -[ -x $DAEMON ] || exit 0 - -[ "$BOOT_START" = "true" ] || exit 0 -[ "$IGNORE_LOCALHOST" = "true" ] && IGNORE_OPTION="--ignore-localhost" - -. /lib/lsb/init-functions - -case "$1" in - start) - # Check that the data directory is writable by the user running - # the HTTP daemon - if [ -d $RRD_DIR ]; then - chown $HTTP_USER:$HTTP_GROUP $RRD_DIR - chmod 755 $RRD_DIR - fi - - log_begin_msg "Starting $DESC:" "$NAME" - if [ -f $PID_FILE ]; then - log_action_cont_msg " already running" - log_end_msg 1 - else - start-stop-daemon --start --quiet --background --pidfile $PID_FILE --exec $DAEMON -- \ - --logfile $MAIL_LOG --daemon --daemon_pid=$PID_FILE \ - --daemon_rrd=$RRD_DIR $IGNORE_OPTION $EXTRA_OPTIONS - log_end_msg $? - fi - ;; - stop) - log_begin_msg "Stopping $DESC:" "$NAME" - start-stop-daemon --stop --pidfile $PID_FILE - rm -f $PID_FILE - log_end_msg $? - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 3 - ;; -esac diff --git a/debian/mailgraph.install b/debian/mailgraph.install deleted file mode 100644 index 55f668e..0000000 --- a/debian/mailgraph.install +++ /dev/null @@ -1,3 +0,0 @@ -mailgraph usr/sbin -mailgraph.cgi usr/lib/cgi-bin -debian/default.conf usr/share/mailgraph diff --git a/debian/mailgraph.manpages b/debian/mailgraph.manpages deleted file mode 100644 index ab624e5..0000000 --- a/debian/mailgraph.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/mailgraph.8 diff --git a/debian/mailgraph.postinst b/debian/mailgraph.postinst deleted file mode 100644 index 4b73ef3..0000000 --- a/debian/mailgraph.postinst +++ /dev/null @@ -1,53 +0,0 @@ -#! /bin/sh -# postinst script for mailgraph -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * <postinst> `configure' <most-recently-configured-version> -# * <old-postinst> `abort-upgrade' <new version> -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -# <new-version> -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -# <failed-install-package> <version> `removing' -# <conflicting-package> <version> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# - -. /usr/share/debconf/confmodule - -DEFAULT="/usr/share/mailgraph/default.conf" - -case "$1" in - configure) - - tempfile=`mktemp` - cp -p /usr/share/mailgraph/default.conf ${tempfile} - - # Merge debconf values into the configuration - for foo in BOOT_START=start_on_boot MAIL_LOG=mail_log IGNORE_LOCALHOST=ignore_localhost; do - db_get mailgraph/${foo#*=} - sed -i -re "s@^(${foo%=*}=).*@\1\"${RET}\"@" "$tempfile" - done - - ucf --debconf-ok ${tempfile} /etc/default/mailgraph - ucfr mailgraph /etc/default/mailgraph - rm -f ${tempfile} - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/mailgraph.postrm b/debian/mailgraph.postrm deleted file mode 100644 index e3cb08d..0000000 --- a/debian/mailgraph.postrm +++ /dev/null @@ -1,43 +0,0 @@ -#! /bin/sh -# postrm script for mailgraph -# -# see: dh_installdeb(1) - -set -e - -# This script is called twice during the removal of the package; once -# after the removal of the package's files from the system, and as -# the final step in the removal of this package, after the package's -# conffiles have been removed. - -case "$1" in - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - purge) - for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do - rm -f /etc/default/mailgraph$ext - done - - rm -f /etc/default/mailgraph - - if which ucf >/dev/null; then - ucf --purge /etc/default/mailgraph - fi - if which ucfr >/dev/null; then - ucfr --purge mailgraph /etc/default/mailgraph - fi - - ;; - - *) echo "$0: didn't understand being called with \`$1'" 1>&2 - exit 0;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - diff --git a/debian/patches/001_path-to-rrd.diff b/debian/patches/001_path-to-rrd.diff deleted file mode 100644 index 442ea58..0000000 --- a/debian/patches/001_path-to-rrd.diff +++ /dev/null @@ -1,31 +0,0 @@ -Description: Set path to rrd files to /var/lib/mailgraph/ -Forwarded: not-needed - ---- a/mailgraph.cgi -+++ b/mailgraph.cgi -@@ -16,9 +16,9 @@ - my $points_per_sample = 3; - my $ypoints = 160; - my $ypoints_err = 96; --my $rrd = 'mailgraph.rrd'; # path to where the RRD database is --my $rrd_virus = 'mailgraph_virus.rrd'; # path to where the Virus RRD database is --my $tmp_dir = '/tmp/mailgraph'; # temporary directory where to store the images -+my $rrd = '/var/lib/mailgraph/mailgraph.rrd'; # path to where the RRD database is -+my $rrd_virus = '/var/lib/mailgraph/mailgraph_virus.rrd'; # path to where the Virus RRD database is -+my $tmp_dir = '/var/lib/mailgraph/'; # temporary directory where to store the images - - my @graphs = ( - { title => 'Last Day', seconds => 3600*24, }, ---- a/mailgraph.pl -+++ b/mailgraph.pl -@@ -377,8 +377,8 @@ - - # global variables - my $logfile; --my $rrd = "mailgraph.rrd"; --my $rrd_virus = "mailgraph_virus.rrd"; -+my $rrd = "/var/lib/mailgraph/mailgraph.rrd"; -+my $rrd_virus = "/var/lib/mailgraph/mailgraph_virus.rrd"; - my $year; - my $this_minute; - my %sum = ( sent => 0, received => 0, bounced => 0, rejected => 0, virus => 0, spam => 0 ); diff --git a/debian/patches/002_script-name.diff b/debian/patches/002_script-name.diff deleted file mode 100644 index 81e5169..0000000 --- a/debian/patches/002_script-name.diff +++ /dev/null @@ -1,16 +0,0 @@ -Description: Allows mailgrap to show graph is the script is renamed -Author: Julien Valroff <julien@debian.org> -Fowrarded: no -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=434486 - ---- a/mailgraph.cgi -+++ b/mailgraph.cgi -@@ -11,7 +11,7 @@ - my $VERSION = "1.14"; - - my $host = (POSIX::uname())[1]; --my $scriptname = 'mailgraph.cgi'; -+my $scriptname = $ENV{"SCRIPT_NAME"}; - my $xpoints = 540; - my $points_per_sample = 3; - my $ypoints = 160; diff --git a/debian/patches/003_web-bug.diff b/debian/patches/003_web-bug.diff deleted file mode 100644 index 16c47a2..0000000 --- a/debian/patches/003_web-bug.diff +++ /dev/null @@ -1,23 +0,0 @@ -Description: Replaces rrdtool badge by a text link to prevent tracking - of Mailgraph installations by oss.oetiker.ch -Author: Malte S. Stretz <debian-bugs@msquadrat.de> -Fowrarded: no -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=611478 - -diff -ur mailgraph-1.14.orig/mailgraph.cgi mailgraph-1.14/mailgraph.cgi ---- mailgraph-1.14.orig/mailgraph.cgi 2007-08-29 11:06:01.000000000 +0200 -+++ mailgraph-1.14/mailgraph.cgi 2011-01-29 20:09:37.000000000 +0100 -@@ -184,12 +184,9 @@ - - print <<FOOTER; - <hr/> --<table><tr><td> - <a href="http://mailgraph.schweikert.ch/">Mailgraph</a> $VERSION - by <a href="http://david.schweikert.ch/">David Schweikert</a></td> --<td align="right"> --<a href="http://oss.oetiker.ch/rrdtool/"><img src="http://oss.oetiker.ch/rrdtool/.pics/rrdtool.gif" alt="" width="120" height="34"/></a> --</td></tr></table> -+(built on Tobi Oetiker's <a href="http://oss.oetiker.ch/rrdtool/">RRDtool</a>) - </body></html> - FOOTER - } diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..90c588f --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,2 @@ +101_mailgraph.pl.diff +102_mailgraph.cgi.diff diff --git a/debian/patches/051_postgrey.diff b/debian/patches/051_postgrey.diff deleted file mode 100644 index b3683e7..0000000 --- a/debian/patches/051_postgrey.diff +++ /dev/null @@ -1,256 +0,0 @@ -Description: Add postgrey and greylisting support to mailgraph -Author: Alexander Bech <alex@bakarasse.de> -Origin: http://www.bakarasse.de/pages/en/linux/mailgraph.php - ---- a/mailgraph.cgi -+++ b/mailgraph.cgi -@@ -16,6 +16,7 @@ - my $points_per_sample = 3; - my $ypoints = 160; - my $ypoints_err = 96; -+my $ypoints_grey = 96; - my $rrd = '/var/lib/mailgraph/mailgraph.rrd'; # path to where the RRD database is - my $rrd_virus = '/var/lib/mailgraph/mailgraph_virus.rrd'; # path to where the Virus RRD database is - my $tmp_dir = '/var/lib/mailgraph/'; # temporary directory where to store the images -@@ -28,12 +29,14 @@ - ); - - my %color = ( -- sent => '000099', # rrggbb in hex -- received => '009900', -- rejected => 'AA0000', -- bounced => '000000', -- virus => 'DDBB00', -- spam => '999999', -+ sent => '000099', # rrggbb in hex -+ received => '009900', -+ rejected => 'AA0000', -+ bounced => '000000', -+ virus => 'DDBB00', -+ spam => '999999', -+ greylisted => '999999', -+ delayed => '006400', - ); - - sub rrd_graph(@) -@@ -151,6 +154,36 @@ - ); - } - -+sub graph_grey($$) -+{ -+ my ($range, $file) = @_; -+ my $step = $range*$points_per_sample/$xpoints; -+ rrd_graph($range, $file, $ypoints_grey, -+ "DEF:greylisted=$rrd_greylist:greylisted:AVERAGE", -+ "DEF:mgreylisted=$rrd_greylist:greylisted:MAX", -+ "CDEF:rgreylisted=greylisted,60,*", -+ "CDEF:dgreylisted=greylisted,UN,0,greylisted,IF,$step,*", -+ "CDEF:sgreylisted=PREV,UN,dgreylisted,PREV,IF,dgreylisted,+", -+ "CDEF:rmgreylisted=mgreylisted,60,*", -+ "AREA:rgreylisted#$color{greylisted}:Greylisted", -+ 'GPRINT:sgreylisted:MAX:total\: %8.0lf msgs', -+ 'GPRINT:rgreylisted:AVERAGE:avg\: %5.2lf msgs/min', -+ 'GPRINT:rmgreylisted:MAX:max\: %4.0lf msgs/min\l', -+ -+ "DEF:delayed=$rrd_greylist:delayed:AVERAGE", -+ "DEF:mdelayed=$rrd_greylist:delayed:MAX", -+ "CDEF:rdelayed=delayed,60,*", -+ "CDEF:ddelayed=delayed,UN,0,delayed,IF,$step,*", -+ "CDEF:sdelayed=PREV,UN,ddelayed,PREV,IF,ddelayed,+", -+ "CDEF:rmdelayed=mdelayed,60,*", -+ "LINE2:rdelayed#$color{delayed}:Delayed ", -+ 'GPRINT:sdelayed:MAX:total\: %8.0lf msgs', -+ 'GPRINT:rdelayed:AVERAGE:avg\: %5.2lf msgs/min', -+ 'GPRINT:rmdelayed:MAX:max\: %4.0lf msgs/min\l', -+ ); -+} -+ -+ - sub print_html() - { - print "Content-Type: text/html\n\n"; -@@ -180,6 +213,7 @@ - print "<h2 id=\"G$n\">$graphs[$n]{title}</h2>\n"; - print "<p><img src=\"$scriptname?${n}-n\" alt=\"mailgraph\"/><br/>\n"; - print "<img src=\"$scriptname?${n}-e\" alt=\"mailgraph\"/></p>\n"; -+ print "<img src=\"$scriptname?${n}-g\" alt=\"mailgraph\"/></p>\n"; - } - - print <<FOOTER; -@@ -232,6 +266,11 @@ - graph_err($graphs[$1]{seconds}, $file); - send_image($file); - } -+ elsif($img =~ /^(\d+)-g$/) { -+ my $file = "$tmp_dir/$uri/mailgraph_$1_grey.png"; -+ graph_grey($graphs[$1]{seconds}, $file); -+ send_image($file); -+ } - else { - die "ERROR: invalid argument\n"; - } ---- a/mailgraph.pl -+++ b/mailgraph.pl -@@ -381,7 +381,7 @@ - my $rrd_virus = "/var/lib/mailgraph/mailgraph_virus.rrd"; - my $year; - my $this_minute; --my %sum = ( sent => 0, received => 0, bounced => 0, rejected => 0, virus => 0, spam => 0 ); -+my %sum = ( sent => 0, received => 0, bounced => 0, rejected => 0, virus => 0, spam => 0, greylisted => 0, delayed => 0); - my $rrd_inited=0; - - my %opt = (); -@@ -395,6 +395,8 @@ - sub event_rejected($); - sub event_virus($); - sub event_spam($); -+sub event_greylisted($); -+sub event_delayed($); - sub init_rrd($); - sub update($); - -@@ -415,8 +417,9 @@ - print " --daemon-log=FILE write verbose-log to FILE instead of /var/log/mailgraph.log\n"; - print " --ignore-localhost ignore mail to/from localhost (used for virus scanner)\n"; - print " --ignore-host=HOST ignore mail to/from HOST regexp (used for virus scanner)\n"; -- print " --only-mail-rrd update only the mail rrd\n"; -- print " --only-virus-rrd update only the virus rrd\n"; -+ print " --no-mail-rrd no update mail rrd\n"; -+ print " --no-virus-rrd no update virus rrd\n"; -+ print " --no-greylist-rrd no update greylist rrd\n"; - print " --rrd-name=NAME use NAME.rrd and NAME_virus.rrd for the rrd files\n"; - print " --rbl-is-spam count rbl rejects as spam\n"; - print " --virbl-is-virus count virbl rejects as viruses\n"; -@@ -431,7 +434,7 @@ - 'year|y=i', 'host=s', 'verbose|v', 'daemon|d!', - 'daemon_pid|daemon-pid=s', 'daemon_rrd|daemon-rrd=s', - 'daemon_log|daemon-log=s', 'ignore-localhost!', 'ignore-host=s@', -- 'only-mail-rrd', 'only-virus-rrd', 'rrd_name|rrd-name=s', -+ 'no-mail-rrd', 'no-virus-rrd', 'no-greylist-rrd', 'rrd_name|rrd-name=s', - 'rbl-is-spam', 'virbl-is-virus' - ) or exit(1); - usage if $opt{help}; -@@ -446,6 +449,7 @@ - $daemon_rrd_dir = $opt{daemon_rrd} if defined $opt{daemon_rrd}; - $rrd = $opt{rrd_name}.".rrd" if defined $opt{rrd_name}; - $rrd_virus = $opt{rrd_name}."_virus.rrd" if defined $opt{rrd_name}; -+ $rrd_virus = $opt{rrd_name}."_greylist.rrd" if defined $opt{rrd_name}; - - # compile --ignore-host regexps - if(defined $opt{'ignore-host'}) { -@@ -522,7 +526,7 @@ - my $year_steps = $month_steps*12; - - # mail rrd -- if(! -f $rrd and ! $opt{'only-virus-rrd'}) { -+ if(! -f $rrd and ! $opt{'no-mail-rrd'}) { - RRDs::create($rrd, '--start', $m, '--step', $rrdstep, - 'DS:sent:ABSOLUTE:'.($rrdstep*2).':0:U', - 'DS:recv:ABSOLUTE:'.($rrdstep*2).':0:U', -@@ -544,7 +548,7 @@ - } - - # virus rrd -- if(! -f $rrd_virus and ! $opt{'only-mail-rrd'}) { -+ if(! -f $rrd_virus and ! $opt{'no-virus-rrd'}) { - RRDs::create($rrd_virus, '--start', $m, '--step', $rrdstep, - 'DS:virus:ABSOLUTE:'.($rrdstep*2).':0:U', - 'DS:spam:ABSOLUTE:'.($rrdstep*2).':0:U', -@@ -561,6 +565,25 @@ - elsif(-f $rrd_virus and ! defined $rrd_virus) { - $this_minute = RRDs::last($rrd_virus) + $rrdstep; - } -+ # greylist rrd -+ if(! -f $rrd_greylist and ! $opt{'no-greylist-rrd'}) { -+ RRDs::create($rrd_greylist, '--start', $m, '--step', $rrdstep, -+ 'DS:greylisted:ABSOLUTE:'.($rrdstep*2).':0:U', -+ 'DS:delayed:ABSOLUTE:'.($rrdstep*2).':0:U', -+ "RRA:AVERAGE:0.5:$day_steps:$realrows", # day -+ "RRA:AVERAGE:0.5:$week_steps:$realrows", # week -+ "RRA:AVERAGE:0.5:$month_steps:$realrows", # month -+ "RRA:AVERAGE:0.5:$year_steps:$realrows", # year -+ "RRA:MAX:0.5:$day_steps:$realrows", # day -+ "RRA:MAX:0.5:$week_steps:$realrows", # week -+ "RRA:MAX:0.5:$month_steps:$realrows", # month -+ "RRA:MAX:0.5:$year_steps:$realrows", # year -+ ); -+ $this_minute = $m; -+ } -+ elsif(-f $rrd_greylist and ! defined $rrd_greylist) { -+ $this_minute = RRDs::last($rrd_greylist) + $rrdstep; -+ } - - $rrd_inited=1; - } -@@ -610,6 +633,9 @@ - elsif($opt{'rbl-is-spam'} and $text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using/) { - event($time, 'spam'); - } -+ elsif($text =~ /Greylisted/) { -+ event($time, 'greylisted'); -+ } - elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: /) { - event($time, 'rejected'); - } -@@ -853,6 +879,16 @@ - event($time, 'virus'); - } - } -+ elsif($prog eq 'postgrey') { -+ # Old versions (up to 1.27) -+ if($text =~ /delayed [0-9]+ seconds: client/) { -+ event($time, 'delayed'); -+ } -+ # New versions (from 1.28) -+ if($text =~ /delay=[0-9]+/) { -+ event($time, 'delayed'); -+ } -+ } - } - - sub event($$) -@@ -870,14 +906,16 @@ - return 1 if $m == $this_minute; - return 0 if $m < $this_minute; - -- print "update $this_minute:$sum{sent}:$sum{received}:$sum{bounced}:$sum{rejected}:$sum{virus}:$sum{spam}\n" if $opt{verbose}; -- RRDs::update $rrd, "$this_minute:$sum{sent}:$sum{received}:$sum{bounced}:$sum{rejected}" unless $opt{'only-virus-rrd'}; -- RRDs::update $rrd_virus, "$this_minute:$sum{virus}:$sum{spam}" unless $opt{'only-mail-rrd'}; -+ print "update $this_minute:$sum{sent}:$sum{received}:$sum{bounced}:$sum{rejected}:$sum{virus}:$sum{spam}:$sum{greylisted}:$sum{delayed}\n" if$ -+ RRDs::update $rrd, "$this_minute:$sum{sent}:$sum{received}:$sum{bounced}:$sum{rejected}" unless $opt{'no-mail-rrd'}; -+ RRDs::update $rrd_virus, "$this_minute:$sum{virus}:$sum{spam}" unless $opt{'no-virus-rrd'}; -+ RRDs::update $rrd_greylist, "$this_minute:$sum{greylisted}:$sum{delayed}" unless $opt{'no-greylist-rrd'}; - if($m > $this_minute+$rrdstep) { - for(my $sm=$this_minute+$rrdstep;$sm<$m;$sm+=$rrdstep) { -- print "update $sm:0:0:0:0:0:0 (SKIP)\n" if $opt{verbose}; -- RRDs::update $rrd, "$sm:0:0:0:0" unless $opt{'only-virus-rrd'}; -- RRDs::update $rrd_virus, "$sm:0:0" unless $opt{'only-mail-rrd'}; -+ print "update $sm:0:0:0:0:0:0:0:0 (SKIP)\n" if $opt{verbose}; -+ RRDs::update $rrd, "$sm:0:0:0:0" unless $opt{'no-mail-rrd'}; -+ RRDs::update $rrd_virus, "$sm:0:0" unless $opt{'no-virus-rrd'}; -+ RRDs::update $rrd_greylist, "$sm:0:0" unless $opt{'no-greylist-rrd'}; - } - } - $this_minute = $m; -@@ -887,6 +925,8 @@ - $sum{rejected}=0; - $sum{virus}=0; - $sum{spam}=0; -+ $sum{greylisted}=0; -+ $sum{delayed}=0; - return 1; - } - -@@ -919,8 +959,9 @@ - --daemon-log=FILE write verbose-log to FILE instead of /var/log/mailgraph.log - --ignore-localhost ignore mail to/from localhost (used for virus scanner) - --ignore-host=HOST ignore mail to/from HOST regexp (used for virus scanner) -- --only-mail-rrd update only the mail rrd -- --only-virus-rrd update only the virus rrd -+ --no-mail-rrd do not update mail rrd -+ --no-virus-rrd do not update virus rrd -+ --no-greylist-rrd do not update greylist rrd - --rrd-name=NAME use NAME.rrd and NAME_virus.rrd for the rrd files - --rbl-is-spam count rbl rejects as spam - --virbl-is-virus count virbl rejects as viruses diff --git a/debian/patches/101_dspam-virus-notifications.diff b/debian/patches/101_dspam-virus-notifications.diff deleted file mode 100644 index 96d4068..0000000 --- a/debian/patches/101_dspam-virus-notifications.diff +++ /dev/null @@ -1,17 +0,0 @@ -Description: Add code to account for infected mail as logged by DSPAM -Author: Julien Valroff <julien@debian.org> -Forwarded: no - - ---- a/mailgraph.pl -+++ b/mailgraph.pl -@@ -774,6 +774,9 @@ - if($text =~ /spam detected from/) { - event($time, 'spam'); - } -+ elsif($text =~ /infected message from/) { -+ event($time, 'virus'); -+ } - } - elsif($prog eq 'spamproxyd' or $prog eq 'spampd') { - if($text =~ /^\s*SPAM/ or $text =~ /^identified spam/) { diff --git a/debian/patches/101_mailgraph.pl.diff b/debian/patches/101_mailgraph.pl.diff new file mode 100644 index 0000000..bbfff29 --- /dev/null +++ b/debian/patches/101_mailgraph.pl.diff @@ -0,0 +1,30 @@ +#! /bin/sh -e +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -Nur mailgraph-1.10.orig/mailgraph.pl mailgraph-1.10/mailgraph.pl +--- mailgraph-1.10.orig/mailgraph.pl 2004-10-25 19:27:09.000000000 +0000 ++++ mailgraph-1.10/mailgraph.pl 2004-11-27 17:51:41.000000000 +0000 +@@ -304,8 +304,8 @@ + + # global variables + my $logfile; +-my $rrd = "mailgraph.rrd"; +-my $rrd_virus = "mailgraph_virus.rrd"; ++my $rrd = "/var/lib/mailgraph/mailgraph.rrd"; ++my $rrd_virus = "/var/lib/mailgraph/mailgraph_virus.rrd"; + my $year; + my $this_minute; + my %sum = ( sent => 0, received => 0, bounced => 0, rejected => 0, virus => 0, spam => 0 ); diff --git a/debian/patches/102_clamav-milter.diff b/debian/patches/102_clamav-milter.diff deleted file mode 100644 index c9eac04..0000000 --- a/debian/patches/102_clamav-milter.diff +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix for clamav-milter >= 0.96 -Author: Adrian von Bidder <avbidder@fortytwo.ch> -Forwarded: no - ---- a/mailgraph.pl -+++ b/mailgraph.pl -@@ -820,6 +820,9 @@ - if($text =~ /Intercepted/) { - event($time, 'virus'); - } -+ elsif($text =~ /Message.*infected by/) { -+ event($time, 'virus'); -+ } - } - # uncommment for clamassassin: - #elsif($prog eq 'clamd') { diff --git a/debian/patches/102_mailgraph.cgi.diff b/debian/patches/102_mailgraph.cgi.diff new file mode 100644 index 0000000..4409c58 --- /dev/null +++ b/debian/patches/102_mailgraph.cgi.diff @@ -0,0 +1,32 @@ +#! /bin/sh -e +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -Nur mailgraph-1.12.orig/mailgraph.cgi mailgraph-1.12/mailgraph.cgi +--- mailgraph-1.12.orig/mailgraph.cgi 2005-10-16 19:17:00.000000000 +0200 ++++ mailgraph-1.12/mailgraph.cgi 2005-11-13 13:43:32.000000000 +0100 +@@ -15,9 +15,9 @@ + my $points_per_sample = 3; + my $ypoints = 160; + my $ypoints_err = 96; +-my $rrd = 'mailgraph.rrd'; # path to where the RRD database is +-my $rrd_virus = 'mailgraph_virus.rrd'; # path to where the Virus RRD database is +-my $tmp_dir = '/tmp/mailgraph'; # temporary directory where to store the images ++my $rrd = '/var/lib/mailgraph/mailgraph.rrd'; # path to where the RRD database is ++my $rrd_virus = '/var/lib/mailgraph/mailgraph_virus.rrd'; # path to where the Virus RRD database is ++my $tmp_dir = '/var/lib/mailgraph'; # temporary directory where to store the images + + my @graphs = ( + { title => 'Day Graphs', seconds => 3600*24, }, diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index d5835d9..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,5 +0,0 @@ -001_path-to-rrd.diff -002_script-name.diff -003_web-bug.diff -101_dspam-virus-notifications.diff -102_clamav-milter.diff diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in index 84a97aa..cef83a3 100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] mailgraph.templates +[type: gettext/rfc822deb] templates diff --git a/debian/po/cs.po b/debian/po/cs.po index c571c6e..8dbde5d 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: mailgraph\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" -"PO-Revision-Date: 2010-09-28 14:20+0200\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2010-01-19 10:28+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" "Language: cs\n" @@ -26,13 +26,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "Má se Mailgraph spouštět při zavádění počítače?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." @@ -42,19 +42,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "Další možností je spouštět mailgraph ručně s parametrem -c." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" -msgstr "Logovací soubor, který má mailgraph používat:" +msgstr "Logovací Soubor, který má mailgraph používat:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." @@ -64,21 +64,22 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Ignorovat poštu z/na localhost?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Počítat příchozí poštu jako odchozí?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"Používáte-li nástroj na filtrování obsahu (např. amavis), je příchozí pošta " -"započítána vícekrát, což znamená chybné hodnoty. Jestliže tedy používáte " -"filtry obsahu, tuto možnost zamítněte." +"Ve výchozím nastavení se příchozí pošta počítá jako odchozí. Používáte-li " +"nástroj na filtrování obsahu (např. amavis), je příchozí pošta započítána " +"vícekrát, což znamená chybné hodnoty. V takovém případě byste měli tuto " +"možnost zamítnout." -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "Počítat příchozí poštu jako odchozí?" +#~ msgid "Ignore mail to/from localhost?" +#~ msgstr "Ignorovat poštu na/z lokálního počítače?" diff --git a/debian/po/da.po b/debian/po/da.po index daea702..693b610 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: mailgraph\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:50+0200\n" -"PO-Revision-Date: 2010-10-13 17:30+01:00\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2010-06-13 17:30+01:00\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n" "Language: \n" @@ -18,35 +18,35 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" -msgstr "Skal Mailgraph igangsættes ved opstart?" +msgstr "Skal Mailgraph startes op ved opstart?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." msgstr "" -"Mailgraph kan igangsættes ved opstart som en dæmon. Herefter vil den overvåge " +"Mailgraph kan starte op ved opstart som en dæmon. Herefter vil den overvåge " "Postfixlogfiler for ændringer. Dette anbefales." #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "Den anden metode er at kalde mailgraph manuelt med parameteren -c." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "Logfil brugt af mailgraph:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." @@ -56,19 +56,18 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Ignorer post til/fra lokal vært (localhost)?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Optæl indkommende post som udgående post?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"Når der bruges et indholdsfilter som amavis, optælles indgående post mere " -"end en gang, hvilket vil medføre forkerte værdier. Hvis du bruger indholdsfiltre, " -"skal du vælge denne indstilling." - +"Hvis du optæller indgående post som udgående post (standard), bliver post " +"optalt mere end en gang, hvis du bruger indholdsfiltre som amavis; så du får " +"forkerte værdier. Hvis du bruger indholdsfiltre, så deaktiver dem." diff --git a/debian/po/de.po b/debian/po/de.po index 97aa388..e3830a7 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,76 +1,79 @@ -# German translation of the mailgraph debconf template. -# Tobias Toedter <t.toedter@gmx.net>, 2006, 2007. -# Martin Eberhard Schauer <Martin.E.Schauer@gmx.de>, 2010. +# German translation of mailgraph debconf template. # This file is distributed under the same license as the mailgraph package. +# +# Tobias Toedter <t.toedter@gmx.net>, 2006, 2007. +# Thomas Müller <thomas.mueller@tmit.eu>, 2010. msgid "" msgstr "" -"Project-Id-Version: mailgraph 1.14-2\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" -"PO-Revision-Date: 2010-08-14 15+2200\n" -"Last-Translator: Martin Eberhard Schauer <Martin.E.Schauer@gmx.de>\n" +"Project-Id-Version: mailgraph 1.14-1.3\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2010-02-28 15:25+0100\n" +"Last-Translator: Thomas Müller <thomas.mueller@tmit.eu>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "Soll Mailgraph beim Hochfahren gestartet werden?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." msgstr "" -"Es wird empfohlen, Mailgraph beim Hochfahren als Daemon zu starten. Der " -"Daemon wird dann Ihre Postfix-Protokolldatei auf Änderungen überwachen." +"Mailgraph kann beim Hochfahren als Daemon gestartet werden. Das Programm " +"wird dann Ihre Postfix-Protokolldatei auf Änderungen überwachen. Dies wird " +"empfohlen." #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "" -"Alternativ können Sie Mailgraph mit dem Parameter -c von Hand aufrufen." +"Die andere Methode ist, mailgraph mit dem Parameter -c von Hand aufzurufen." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" -msgstr "Von Mailgraph verwendete Protokolldatei:" +msgstr "Von mailgraph verwendete Protokolldatei:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." msgstr "" -"Geben Sie die Protokolldatei an, die bei der Erstellung der Mailgraph-" -"Datenbanken verwendet werden soll. Falls Sie unsicher sind, übernehmen Sie " -"die Voreinstellung (/var/log/mail.log)." +"Geben Sie die Protokolldatei ein, die verwendet werden soll, um die " +"Datenbanken für mailgraph zu erstellen. Falls Sie unsicher sind, belassen " +"Sie die Voreinstellung (/var/log/mail.log)." #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "E-Mail von/zu Ihrem Rechner ignorieren?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Sollen eingehende Nachrichten als ausgehende gezählt werden?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"Wenn Sie E-Mail-Inhaltsfilter wie AMaViS einsetzen, werden eingehende E-" -"Mails mehrfach gezählt. Sie erhalten dann falsche Ergebnisse. Falls Sie " -"einen Inhaltsfilter verwenden, sollten Sie diese Option wählen." +"Wenn Sie eingehende Nachrichten als ausgehende zählen (was der Standard " +"ist), werden die Nachrichten mehrmals gezählt, falls Sie einen Inhaltsfilter " +"wie etwa »amavis« einsetzen, was zu falschen Werten führt. Falls Sie " +"irgendeinen Inhaltsfilter einsetzen, sollten Sie diese Option abwählen." diff --git a/debian/po/es.po b/debian/po/es.po index af3bd2a..b706b18 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -1,109 +1,107 @@ -# mailgraph translation to spanish -# Copyright (C) 2007 Software in the Public Interest, SPI Inc. +# mailgraph po-debconf translation to Spanish +# Copyright (C) 2007, 2010 Software in the Public Interest, SPI Inc. # This file is distributed under the same license as the mailgraph package. # # Changes: -# - Initial translation -# Steve Lord Flaubert , 2007 +# - Initial translation +# Steve Lord Flaubert <stonescenter@gmail.com>, 2007 # -# - Revision and update -# Ricardo Fraile, 2010 +# - Updates +# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2010 # -# -# Traductores, si no conoce el formato PO, merece la pena leer la -# documentación de gettext, especialmente las secciones dedicadas a este -# formato, por ejemplo ejecutando: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' # # Equipo de traducción al español, por favor lean antes de traducir # los siguientes documentos: # -# - El proyecto de traducción de Debian al español -# http://www.debian.org/intl/spanish/ -# especialmente las notas y normas de traducción en -# http://www.debian.org/intl/spanish/notas -# -# - La guía de traducción de po's de debconf: -# /usr/share/doc/po-debconf/README-trans -# o http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Si tiene dudas o consultas sobre esta traducción consulte con el último -# traductor (campo Last-Translator) y ponga en copia a la lista de -# traducción de Debian al español (<debian-l10n-spanish@lists.debian.org>) +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas # +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans # msgid "" msgstr "" -"Project-Id-Version: mailgraph 1.13-1\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" -"PO-Revision-Date: 2010-09-09 14:15-0500\n" -"Last-Translator: Ricardo Fraile <rikr@esdebian.org>\n" -"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" -"Language: es\n" +"Project-Id-Version: mailgraph 1.14-1.3\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2010-02-25 08:18+0100\n" +"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" +"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "¿Desea iniciar Mailgraph en el arranque del sistema?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." msgstr "" -"Mailgraph puede iniciar como demonio al momento del arranque. Se recomienda " -"esto, ya que controlará el fichero de registros de Postfix para cualquier " -"cambio." +"Mailgraph puede iniciarse como demonio en el momento del arranque. Se " +"recomienda esto, ya que controlará el archivo de registros de Postfix en " +"busca de cambios." #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "" -"La otra forma es llamar manualmente a mailgraph, dándole el parámetro -c." +"La otra forma es ejecutar manualmente Mailgraph, proporcionando el parámetro " +"«-c»." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" -msgstr "Fichero de registros de mailgraph:" +msgstr "Archivo de registros de mailgraph:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." msgstr "" -"Ingrese el fichero de registros que se usará para crear la base de datos de " -"mailgraph. Deje en blanco si no está seguro. Por omisión es «/var/log/mail." -"log»." +"Introduzca el archivo de registros que se usará para crear la base de datos " +"de Mailgraph. Deje este campo en blanco si no está seguro. De forma " +"predeterminada el archivo es «/var/log/mail.log»." #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "¿Ignorar correo hacia/desde «localhost»?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "¿Contar correo entrante como saliente?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"Cuando se usa un filtro de contenido como amavis, el correo entrante es " -"contadomás de una vez, lo que dará lugar a valores erróneos. Si usa algún " -"filtro decontenido, deberá elegir esta opción." +"Si cuenta los correos entrantes como salientes (forma predeterminada), " +"cuando use un filtro de contenido como amavis los correos se contarán más de " +"una vez, lo que producirá valores erróneos. Si usa algún filtro de " +"contenido, debería desactivar esta opción." -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "¿Contar correo entrante como saliente?" +#~ msgid "Ignore mail to/from localhost?" +#~ msgstr "" +#~ "¿Desea ignorar el correo electrónico dirigido a o enviado desde la " +#~ "máquina local («localhost»)?" diff --git a/debian/po/eu.po b/debian/po/eu.po index bf0ecd5..672cbb9 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -1,81 +1,75 @@ -# translation of mailgraph_1.14-4.1_eu.po to Basque +# translation of mailgraph-templates-eu.po to Euskara # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Piarres Beobide <pi@beobide.net>, 2008. -# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2010. msgid "" msgstr "" -"Project-Id-Version: mailgraph_1.14-4.1_eu\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:50+0200\n" -"PO-Revision-Date: 2010-10-12 18:24+0200\n" -"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n" -"Language-Team: Basque <debian-l10n-basque@lists.debian.org>>\n" +"Project-Id-Version: mailgraph-templates-eu\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2008-04-09 23:15+0200\n" +"Last-Translator: Piarres Beobide <pi@beobide.net>\n" +"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" -msgstr "Mailgraph sistema abioan abiarazi behar da?" +msgstr "Mailgraph sistema abioan abiarazi behar al da?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." msgstr "" -"Sistema abiatzean mailgraph abiarazi daiteke deabru moduan. Ondoren, " -"postfix-en egunkaria monitoriza dezake aldaketen bila. Hau da gomendatutakoa." +"Mailgraph sistema abioan abiarazi daiteke deabru moduan. Orduan zure postfix " +"erregistro fitxategiak arakatuko ditu aldaketen bila. Hau da gomendatutakoa." #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "Beste modua mailgraph eskuz abiarazi eta -c parametroa erabiltzea da." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" -msgstr "Egunkaria mailgraph-ek erabiltzeko:" +msgstr "Mailgraph-ek erabiliko duen erregistro-fitxategia:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." msgstr "" -"Idatzi egunkaria mailgraph-en datu-basea sortzean erabiltzeko. " -"Ziur ez bazaude, utzi lehenetsia (/var/log/mail.log)." +"Idatzi mailgraph datubasea sortzeko erabiliko den erregistro-fitxategia. " +"Ziur ez bazaude utzi lehenetsiriko (/var/log/mail.log)." #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Ezikusi egin mezuak bidaltzea/jasotzea ostalari lokalean?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Zenbatu jasotako posta bidalitako posta gisa?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -#| msgid "" -#| "If you count incoming mail as outgoing mail (default), mail is counted " -#| "more than once if you use content filters like amavis, so you'll get " -#| "wrong values. If you're using some content filter, disable this." +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"'amavis' bezalako edukien iragazkia erabiltzean, sarrerako mezua behin baino " -"gehiagotan zenbatzen da, okerreko emaitzak sortuz. Edukien iragazki bat " -"erabiltzen baduzu, aukera hau hautatu beharko zenuke." - +"Jasotako posta bidelitako posta gisa zenbatuaz gero (lehenetsia), posta " +"behin baino gehiago zenbatu daiteke amavis bezalako eduki iragazki batenbat " +"erabiltzen baduzu, orduan okerreko balioak eskuratu ditzakezu. Eduki " +"iragazki batenbat erabiltzen baduzu hau ezgaitu." diff --git a/debian/po/fi.po b/debian/po/fi.po index c321a41..201e87b 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -2,29 +2,27 @@ msgid "" msgstr "" "Project-Id-Version: mailgraph\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" -"PO-Revision-Date: 2010-01-09 21:50+0200\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2010-10-23 12:45+0300\n" "Last-Translator: Esko Arajärvi <edu@iki.fi>\n" -"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" +"Language-Team: debian-10n-finnish@lists.debian.org\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Finnish\n" -"X-Poedit-Country: FINLAND\n" -"X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.6.1\n" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "Tulisiko Mailgraph käynnistää käynnistettäessä järjestelmä?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." @@ -35,20 +33,20 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "" "Toinen mahdollinen tapa on kutsua mailgraphia käsin parametrin -c kanssa." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "Ohjelman mailgraph käyttämä lokitiedosto:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." @@ -58,18 +56,21 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Jätetäänkö paikalliset viestit huomiotta?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Lasketaanko tulevat viestit lähtevinä? " #. Type: boolean #. Description -#: ../mailgraph.templates:3001 +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"Käytettäessä sisältösuodattimia kuten amavis, tulevat viestit lasketaan " -"useammin kuin kerran ja tulokset vääristyvät. Valitse tämä vaihtoehto, jos " -"käytössä on jokin sisältösuodatin." +"Jos käytössä on sisältösuodattimia kuten amavis ja tulevat viestit lasketaan " +"lähtevinä, viestit lasketaan useammin kuin kerran ja tulokset vääristyvät. " +"Älä valitse tätä, jos käytössä on jokin sisältösuodatin." + +#~ msgid "Ignore mail to/from localhost?" +#~ msgstr "Jätetäänkö paikalliset viestit huomiotta?" diff --git a/debian/po/fr.po b/debian/po/fr.po index fc7029d..2588aef 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -12,82 +12,76 @@ # Developers do not need to manually edit POT or PO files. # # Initial translator: Jean-Christophe Champarnaud <jc.champarnaud@free.fr> -# Christian Perrier <bubulle@debian.org>, 2010. msgid "" msgstr "" "Project-Id-Version: mailgraph\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" -"PO-Revision-Date: 2010-08-12 22:58-0400\n" -"Last-Translator: Christian Perrier <bubulle@debian.org>\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2006-05-06 21:13+0200\n" +"Last-Translator: Thomas Huriaux <thomas.huriaux@gmail.com>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" -msgstr "Mailgraph doit-il être lancé au démarrage ?" +msgstr "Mailgraph doit-il tre lanc au dmarrage?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." msgstr "" -"Mailgraph peut être lancé au démarrage, en mode démon. Il pourra ainsi " -"contrôler les modifications dans le fichier de journalisation de Postfix. " -"Cette option est recommandée." +"Mailgraph peut tre lanc au dmarrage, en mode dmon. Il pourra ainsi " +"contrler les modifications dans le fichier de journalisation de Postfix. " +"Cette option est recommande." #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "" -"Il est également possible d'utiliser mailgraph.pl en le lançant vous-même " -"avec le paramètre « -c »." +"Il est galement possible d'utiliser mailgraph.pl en le lanant vous-mme " +"avec le paramtre -c." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" -msgstr "Fichier de journalisation à utiliser par mailgraph :" +msgstr "Fichier de journalisation utiliser par mailgraph:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." msgstr "" "Veuillez indiquer le fichier de journalisation que mailgraph analysera pour " -"créer sa base de données. Dans le doute, laissez la valeur par défaut." +"crer sa base de donnes. Dans le doute, laissez la valeur par dfaut." #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Faut-il ignorer les courriers de et pour localhost ?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Faut-il compter les courriels entrants comme des courriels sortants?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"Si vous utilisez des filtres de contenu comme amavis, les courriels entrants " -"seront comptés plus d'une fois et les résultats de mailgraph seront donc " -"incorrects. Si vous utilisez un filtre de contenu de ce type, vous devriez " -"choisir cette option." - -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "" -#~ "Faut-il compter les courriels entrants comme des courriels sortants ?" +"Si vous comptez les courriels entrants avec les courriels sortants " +"(comportement par dfaut), ils seront dnombrs plus d'une fois si vous " +"utilisez des filtres de contenu comme amavis. Les valeurs seront donc " +"incorrectes. Si vous utilisez un filtre de contenu de ce type, ne choisissez " +"pas cette option." diff --git a/debian/po/gl.po b/debian/po/gl.po index 8b61838..9bb583d 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: mailgraph\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" "PO-Revision-Date: 2008-04-09 21:18+0100\n" "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -17,13 +17,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "¿Debería iniciarse Mailgraph co ordenador?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." @@ -34,19 +34,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "O outro método consiste en executar mailgraph á man co parámetro -c." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "Ficheiro de rexistro a empregar por mailgraph:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." @@ -57,27 +57,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "¿Contar o correo de entrada coma correo de saída?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -#, fuzzy -#| msgid "" -#| "If you count incoming mail as outgoing mail (default), mail is counted " -#| "more than once if you use content filters like amavis, so you'll get " -#| "wrong values. If you're using some content filter, disable this." +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" "Se conta o correo de entrada coma correo de saída (opción por defecto), o " "correo hase contar máis dunha vez se emprega filtros de contido coma amavis, " "así que ha obter valores incorrectos. Se emprega un filtro de contido, " "desactive esta opción." - -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "¿Contar o correo de entrada coma correo de saída?" diff --git a/debian/po/it.po b/debian/po/it.po index 835eb1e..14f1d01 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,13 +1,14 @@ -# Italian (it) translation of debconf templates for mailgraph -# This file is distributed under the same license as the mailgraph package. -# Luca Monducci <luca.mo@tiscali.it>, 2006-2010 -# +# Italian (it) translation of debconf templates for mailgraph
+# COPYRIGHT (C) 2010 THE mailgraph'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mailgraph package.
+# Luca Monducci <luca.mo@tiscali.it>, 2006-2010.
+#
msgid "" msgstr "" "Project-Id-Version: mailgraph 1.14 italian debconf templates\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" -"PO-Revision-Date: 2010-08-20 16:01+0200\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2010-02-28 17:21+0100\n" "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" "Language: it\n" @@ -17,59 +18,57 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "Far partire Mailgraph all'avvio?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." msgstr "" -"Mailgraph pu? essere fatto partire all'avvio come demone. Poi controlla le " -"modifiche al file di log di Postfix. Questo ? il metodo raccomandato." +"Mailgraph può essere fatto partire all'avvio come demone. Poi monitora le " +"modifiche al file di log di Postfix. Questo è il metodo raccomandato." #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." -msgstr "L'altro metodo ? richiamare manualmente mailgraph con il parametro -c." +msgstr "L'altro metodo è richiamare manualmente mailgraph con il parametro -c." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "File di log per mailgraph:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." msgstr "" "Inserire il file di log che mailgraph deve usare per creare i database. Se " -"non si ? sicuri lasciare il valore predefinito (/var/log/mail.log)." +"non si è sicuri lasciare il valore predefinito (/var/log/mail.log)." #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Ignorare le mail da/per localhost?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Contare la posta in entrata come la posta in uscita?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"Se si usano dei content filter come amavis, le mail in arrivo sono contate " -"pi? di una volta e quindi si ottengono dei valori sbagliati. Se si usano dei " -"content filter si deve abilitare questa opzione." - -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "Contare le mail in arrivo come mail in uscita?" +"Qualora si conti la posta in entrata come la posta in uscita (questo è il " +"funzionamento predefinito), la posta è contata più di una volta se si usano " +"dei filtri di contenuto come amavis e questo comporta la lettura di valori " +"sbagliati. Se si usano dei filtri di contenuto, attivare questa opzione." diff --git a/debian/po/ja.po b/debian/po/ja.po index ad272d4..f144599 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -1,17 +1,15 @@ # Copyright (C) 2008-2010 Norbert Tretkowski <nobse@debian.org> -# as mailgraph Debian package's copyright holder -# and Hideki Yamane (Debian-JP) <henrich@debian.or.jp> -# +# as mailgraph Debian package's copyright holder. # This file is distributed under the same license as the mailgraph package. # Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008-2010. -# +# msgid "" msgstr "" -"Project-Id-Version: mailgraph 1.14-4.1\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:50+0200\n" -"PO-Revision-Date: 2010-10-12 14:02+0900\n" -"Last-Translator: Hideki Yamane <henrich@debian.org>\n" +"Project-Id-Version: mailgraph 1.14-1.3\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2010-02-25 19:21+0200\n" +"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -20,13 +18,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "mailgraph を起動時に開始しますか?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." @@ -36,19 +34,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "手動で -c パラメータをつけて mailgraph を起動するやり方もあります。" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "mailgraph が利用するログファイル:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." @@ -58,19 +56,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "ローカルホスト宛、またはローカルホスト発のメールを無視しますか?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "受信メールを送信メールとしてカウントしますか?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"amavis のようなコンテンツフィルタを使っている場合、受信メールが 1 回より多く" -"カウントされ、誤った値となります。何かコンテンツフィルタを使っている場合は、" -"このオプションを選ぶ必要があります。" - +"受信メールを送信メールとしてカウントする場合 (デフォルトの挙動)、メールは" +"amavis のようなコンテンツフィルタを使っていると複数回カウントされるため、間" +"違った値を受けとることになります。何かコンテンツフィルタを使っている場合は、" +"これは無効にしてください。" diff --git a/debian/po/nb.po b/debian/po/nb.po index 8a46187..5f043a4 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: mailgraph_1.12-2_nb\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" "PO-Revision-Date: 2007-01-03 13:07+0100\n" "Last-Translator: Bjrn Steensrud <bjornst@powertech.no>\n" "Language-Team: Norwegian Bokml <i18n-nb@lister.ping.uio.no>\n" @@ -18,13 +18,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "Skal Mailgraph startes ved oppstart?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." @@ -34,19 +34,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "Den andre metoden er kalle opp mailgraph manuelt med parameteren -c." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "Hvilken loggfil skal mailgraph bruke:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." @@ -56,26 +56,18 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Telle innkommende e-post som utgende?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -#, fuzzy -#| msgid "" -#| "If you count incoming mail as outgoing mail (default), mail is counted " -#| "more than once if you use content filters like amavis, so you'll get " -#| "wrong values. If you're using some content filter, disable this." +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" "Hvis du teller innkommende e-post som utgende (standard), s blir e-post " "telt mer enn n gang hvis du bruker innholdsfiltre som f.eks. amavis, slik " "at du fr feil verdier. Hvis du bruker et innholdsfilter, s sl av dette." - -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "Telle innkommende e-post som utgende?" diff --git a/debian/po/nl.po b/debian/po/nl.po index bda9e69..6bcc082 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -6,10 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: mailgraph\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:50+0200\n" -"PO-Revision-Date: 2010-10-18 07:47+0100\n" -"Last-Translator: Remco Rijnders <remco@webconquest.com>\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2007-03-09 19:10+0100\n" +"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" "Language: \n" "MIME-Version: 1.0\n" @@ -18,50 +18,60 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" -msgstr "Dient mailgraph gestart te worden bij het opstarten van het systeem?" +msgstr "Wilt u mailgraph starten tijdens het opstarten van het systeem?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 -msgid "Mailgraph can start on boot time as a daemon. Then it will monitor your Postfix logfile for changes. This is recommended." -msgstr "Mailgraph kan bij het opstarten van dit systeem gestart worden als achtergronddienst. Het overziet dan uw Postfix-logbestand voor veranderingen. Deze optie wordt aangeraden." +#: ../templates:1001 +msgid "" +"Mailgraph can start on boot time as a daemon. Then it will monitor your " +"Postfix logfile for changes. This is recommended." +msgstr "" +"Mailgraph kan bij het opstarten van dit systeem gestart worden als " +"achtergronddienst, hierdoor overziet het uw Postfix-logbestand voor " +"veranderingen. Dit is de aangeraden optie." #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." -msgstr "De andere optie is om mailgraph handmatig aan te roepen met de -c parameter." +msgstr "" +"De andere optie is om mailgraph handmatig aan te roepen met de -c parameter." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "Door mailgraph te gebruiken logbestand:" #. Type: string #. Description -#: ../mailgraph.templates:2001 -msgid "Enter the logfile which should be used to create the databases for mailgraph. If unsure, leave default (/var/log/mail.log)." -msgstr "Welk logbestand dient gebruikt te worden voor het aanmaken van de mailgraph-databases? Laat dit bij twijfel op de standaardwaarde (/var/log/mail.log) staan." +#: ../templates:2001 +msgid "" +"Enter the logfile which should be used to create the databases for " +"mailgraph. If unsure, leave default (/var/log/mail.log)." +msgstr "" +"Welk logbestand dient gebruikt te worden voor het aanmaken van de mailgraph-" +"databases? Laat dit bij twijfel op de standaardwaarde (/var/log/mail.log) " +"staan." #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Wilt u e-mail van/naar localhost negeren?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Inkomende e-mail als uitgaande e-mail tellen?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -#| msgid "" -#| "If you count incoming mail as outgoing mail (default), mail is counted " -#| "more than once if you use content filters like amavis, so you'll get " -#| "wrong values. If you're using some content filter, disable this." -msgid "When using a content filter like amavis, incoming mail is counted more than once, which will result in wrong values. If you use some content filter, you should choose this option." -msgstr "Wanneer u inhoudsfilters zoals amavis gebruikt, wordt binnenkomende e-mail meer dan eens geteld wat zal resulteren in incorrecte aantallen. Als u een inhoudsfilter gebruikt kunt u het beste deze optie kiezen." - -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "Inkomende e-mail als uitgaande e-mail tellen?" - +#: ../templates:3001 +msgid "" +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." +msgstr "" +"Als u de inkomende e-mail als uitgaande e-mail telt (wat de standaardwaarde " +"is), krijgt u foute waarden als u inhoudfilters zoals amavis gebruikt. Dit " +"omdat berichten dan meer dan eens geteld worden. Als u een inhoudsfilter " +"gebruikt kunt u dit best uitschakelen." diff --git a/debian/po/pt.po b/debian/po/pt.po index 8ba68ca..e16856a 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -1,32 +1,32 @@ -# Translation of mailgraph debconf to Portuguese +# translation of mailgraph debconf to Portuguese +# Portuguese translation for mailgraph # This file is distributed under the same license as the mailgraph package. -# # André Costa <skit@argon.ath.cx>, 2006. -# Américo Monteiro <a_monteiro@netcabo.pt>, 2007, 2010. +# Américo Monteiro <a_monteiro@netcabo.pt>, 2007. +# msgid "" msgstr "" -"Project-Id-Version: mailgraph 1.14-2\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" -"PO-Revision-Date: 2010-08-10 17:44+0100\n" +"Project-Id-Version: mailgraph 1.13-1\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2007-09-23 08:53+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.4\n" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "Deve o Mailgraph ser iniciado no arranque?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." @@ -36,44 +36,42 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "O outro método é chamar manualmente o mailgraph com o parâmetro -c." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "Ficheiro de relatório usado pelo mailgraph:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." msgstr "" "Especifique o ficheiro de registo que deve ser usado para criar a base de " -"dados para o mailgraph. Se não tiver a certeza, deixe o valor predefinido (/" +"dados para o mailgraph. Se não tiver a certeza, deixe o valor por omissão (/" "var/log/mail.log)." #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Ignorar mail para/de localhost?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Contar o correio a receber como correio a enviar?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"Quando se usa um filtro de conteúdo como o amavis,o mail recebido é contado " -"mais do que uma vez, o que irá resultar em valores errados. Se você usar " -"algum filtro de conteúdo, deverá escolher esta opção." - -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "Contar o correio a receber como correio a enviar?" +"Se contar o correio a receber como correio a enviar (por omissão), o correio " +"é contado mais do que uma vez se usar filtros de conteúdo como o amavis, por " +"isso irá obter valores errados. Se estiver a usar filtros de conteúdo, " +"desactive esta função." diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 690d724..6d914f3 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mailgraph 1.12-2\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" "PO-Revision-Date: 2006-11-26 21:43-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n" "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n" @@ -19,13 +19,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "Mailgraph deveria ser iniciado durante o processo de inicialização?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." @@ -36,19 +36,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "O outro método é executar o mailgraph manualmente com o parâmetro -c." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "Arquivo de \"log\" usado pelo mailgraph:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." @@ -59,27 +59,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Contar e-mails que foram recebidos como e-mails que foram enviados?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -#, fuzzy -#| msgid "" -#| "If you count incoming mail as outgoing mail (default), mail is counted " -#| "more than once if you use content filters like amavis, so you'll get " -#| "wrong values. If you're using some content filter, disable this." +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" "Se você contar e-mails que foram recebido como e-mails que foram enviados " "(padrão) e-mails são contados mais de uma vez se você usar filtros de " "conteúdos como amavis, portanto você terá valores errados. Se você estiver " "usando algum filtro de conteúdo, desabilite esta opção." - -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "Contar e-mails que foram recebidos como e-mails que foram enviados?" diff --git a/debian/po/ru.po b/debian/po/ru.po index d9b7f8d..0b5fef4 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -1,34 +1,34 @@ # translation of ru.po to Russian # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the mailgraph package. +# This file is distributed under the same license as the PACKAGE package. # # Yuri Kozlov <kozlov.y@gmail.com>, 2008. # Yuri Kozlov <yuray@komyakino.ru>, 2010. msgid "" msgstr "" -"Project-Id-Version: mailgraph 1.14-4.1\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:50+0200\n" -"PO-Revision-Date: 2010-10-12 19:12+0400\n" +"Project-Id-Version: mailgraph 1.14-1.3\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2010-02-25 21:06+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "Запускать Mailgraph при запуске операционной системы?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." @@ -39,19 +39,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "Также можно запускать mailgraph вручную с параметром -c." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "Журнал, используемый mailgraph:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." @@ -62,25 +62,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Игнорировать почту для/от localhost?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Считать входящую почту как исходящую?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -#| msgid "" -#| "If you count incoming mail as outgoing mail (default), mail is counted " -#| "more than once if you use content filters like amavis, so you'll get " -#| "wrong values. If you're using some content filter, disable this." +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"Если вы используете фильтр по содержимому типа amavis входящая почта " -"считается более одного раза, что приводит к неверным значениям. " -"Если вы используете фильтры по содержимому, ответьте утвердительно." - -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "Считать входящую почту как исходящую?" +"Если вы считаете входящую почту как исходящую (по умолчанию), то в случае " +"использования фильтра по содержимому типа amavis почта будет считаться более " +"одного раза, что приведёт к неверным значениям. Если вы используете фильтры " +"по содержимому, ответьте отрицательно." diff --git a/debian/po/sk.po b/debian/po/sk.po index 7a53c6b..b0ca175 100644 --- a/debian/po/sk.po +++ b/debian/po/sk.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mailgraph\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:50+0200\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" "PO-Revision-Date: \n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -19,50 +19,56 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "Spustiť Mailgraph pri štarte systému?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 -msgid "Mailgraph can start on boot time as a daemon. Then it will monitor your Postfix logfile for changes. This is recommended." -msgstr "Mailgraph sa môže spustiť pri štarte systému. Bude potom monitorovať zmeny v súbore so záznamom Postfixu. Toto je odporúčaná voľba." +#: ../templates:1001 +msgid "" +"Mailgraph can start on boot time as a daemon. Then it will monitor your " +"Postfix logfile for changes. This is recommended." +msgstr "" +"Mailgraph sa môže spustiť pri štarte systému. Bude potom monitorovať zmeny v " +"súbore so záznamom Postfixu. Toto je odporúčaná voľba." #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "Druhý spôsob je volať mailgraph ručne s parametrom -c." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "Súbor so záznamom, ktorý mailgraph používa:" #. Type: string #. Description -#: ../mailgraph.templates:2001 -msgid "Enter the logfile which should be used to create the databases for mailgraph. If unsure, leave default (/var/log/mail.log)." -msgstr "Zadajte súbor so záznamom, ktorý sa má použiť na vytvorenie databázy pre mailgraph. Ak si nie ste istý, ponechajte predvolený (/var/log/mail.log)." +#: ../templates:2001 +msgid "" +"Enter the logfile which should be used to create the databases for " +"mailgraph. If unsure, leave default (/var/log/mail.log)." +msgstr "" +"Zadajte súbor so záznamom, ktorý sa má použiť na vytvorenie databázy pre " +"mailgraph. Ak si nie ste istý, ponechajte predvolený (/var/log/mail.log)." #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Ignorovať poštu pre/od localhost?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Započítať prichádzajúcu poštu ako odchádzajúcu?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -#| msgid "" -#| "If you count incoming mail as outgoing mail (default), mail is counted " -#| "more than once if you use content filters like amavis, so you'll get " -#| "wrong values. If you're using some content filter, disable this." -msgid "When using a content filter like amavis, incoming mail is counted more than once, which will result in wrong values. If you use some content filter, you should choose this option." -msgstr "Ak používate filter obsahu ako amavis, pošta sa započíta viac ako raz, takže dostanete nesprávne hodnoty. Ak používate nejaký filter obsahu, túto voľbu vypnite." - -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "Započítať prichádzajúcu poštu ako odchádzajúcu?" - +#: ../templates:3001 +msgid "" +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." +msgstr "" +"Ak počítate prichádzajúcu poštu ako odchádzajúcu (predvolené), pošta sa " +"započíta viac ako raz ak používate filtre obsahu ako amavis, takže dostanete " +"nesprávne hodnoty. Ak používate nejaký filter obsahu, túto voľbu vypnite." diff --git a/debian/po/sv.po b/debian/po/sv.po index 6c929a2..d23d0ee 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -1,15 +1,15 @@ -# Translation of mailgraph debconf template to Swedish -# Copyright (C) 2010 Martin Bagge <brother@bsnet.se> -# This file is distributed under the same license as the mailgraph package. -# -# Martin Bagge <brother@bsnet.se>, 2008, 2010 +# Translation of mailgraph debconf template to Swedish
+# Copyright (C) 2010 Martin Bagge <brother@bsnet.se>
+# This file is distributed under the same license as the mailgraph package.
+#
+# Martin Bagge <brother@bsnet.se>, 2008, 2010
msgid "" msgstr "" "Project-Id-Version: mailgraph 1.11-1\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:50+0200\n" -"PO-Revision-Date: 2010-10-12 10:25+0100\n" -"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2010-03-04 22:59+0100\n" +"Last-Translator: Martin Bagge <brother@bsnet.se>\n" "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -20,13 +20,13 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "Ska Mailgraph startas vid systemets uppstart?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." @@ -36,19 +36,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "Den andra metoden är all starta mailgraph manuellt med parametern -c." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "Loggfil för mailgraph?" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." @@ -58,25 +58,22 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Ignorera post till/från lokal värd?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Beräkna inkommande mail som utgående mail?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -#| msgid "" -#| "If you count incoming mail as outgoing mail (default), mail is counted " -#| "more than once if you use content filters like amavis, so you'll get " -#| "wrong values. If you're using some content filter, disable this." +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"När ett innehållsfilter som ex. amavis används kommer inkommande e-post att " -"räknas mer än en gång, detta kommer att resultera i felaktiga värden. " -"Använder du innehållsfilter ska du avaktivera detta alternativ.." +"Om du beräknar inkommande e-post som utgående e-post (standardförfarandet) " +"kommer e-post att räknas mer än en gång om du använder innehållsfilter som " +"ex. amavis, detta kommer därmed innebära felaktiga värden. Använder du " +"innehållsfilter ska du avaktivera detta alternativ." -#~ msgid "Count incoming mail as outgoing mail?" -#~ msgstr "Beräkna inkommande mail som utgående mail?" +#~ msgid "Ignore mail to/from localhost?" +#~ msgstr "Ignorera post till/från lokal värd?" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index a94460b..d29dd9d 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -7,25 +7,24 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." @@ -33,19 +32,19 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" msgstr "" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." @@ -53,15 +52,15 @@ msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" msgstr "" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" diff --git a/debian/po/vi.po b/debian/po/vi.po index 49609d2..3a714ba 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -1,13 +1,13 @@ # Vietnamese translation for MailGraph. -# Copyright © 2010 Free Software Foundation, Inc. -# Clytie Siddall <clytie@riverland.net.au>, 2006-2010. +# Copyright © 2008 Free Software Foundation, Inc. +# Clytie Siddall <clytie@riverland.net.au>, 2006-2008. # msgid "" msgstr "" -"Project-Id-Version: mailgraph 1.14-2\n" -"Report-Msgid-Bugs-To: mailgraph@packages.debian.org\n" -"POT-Creation-Date: 2010-10-12 06:32+0200\n" -"PO-Revision-Date: 2010-02-11 19:07+0930\n" +"Project-Id-Version: mailgraph 1.14-1.1\n" +"Report-Msgid-Bugs-To: nobse@debian.org\n" +"POT-Creation-Date: 2006-11-14 23:38+0100\n" +"PO-Revision-Date: 2008-04-22 22:27+0930\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" "Language: vi\n" @@ -15,61 +15,62 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.8\n" +"X-Generator: LocFactoryEditor 1.7b3\n" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "Should Mailgraph start on boot?" -msgstr "Khởi chạy Mailgraph vào lúc khởi động ?" +msgstr "Mailgraph có nên khởi chạy khi khởi động hệ thống không?" #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "" "Mailgraph can start on boot time as a daemon. Then it will monitor your " "Postfix logfile for changes. This is recommended." msgstr "" "Chương trình Mailgraph có khả năng khởi chạy như là trình nền vào lúc khởi " -"động hệ thống. Vì thế nó sẽ theo dõi tập tin theo dõi Postfix có thay đổi " +"động hệ thống. Vì thế nó sẽ theo dõi tập tin ghi lưu Postfix có thay đổi " "chưa. Khuyên bạn bật tùy chọn này." #. Type: boolean #. Description -#: ../mailgraph.templates:1001 +#: ../templates:1001 msgid "The other method is to call mailgraph by hand with the -c parameter." msgstr "Phương pháp khác là gọi mailgraph bằng tay với tham số « -c »." #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "Logfile used by mailgraph:" -msgstr "Tập tin theo dõi được mailgraph dùng:" +msgstr "Tập tin ghi lưu được mailgraph dùng:" #. Type: string #. Description -#: ../mailgraph.templates:2001 +#: ../templates:2001 msgid "" "Enter the logfile which should be used to create the databases for " "mailgraph. If unsure, leave default (/var/log/mail.log)." msgstr "" -"Hãy nhập tên tập tin theo dõi (logfile) nên dùng để tạo các cơ sở dữ liệu " -"cho mailgraph. Chưa chắc thì để lại giá trị mặc định (/var/log/mail.log)." +"Hãy nhập tên tập tin ghi lưu nên được dùng để tạo các cơ sở dữ liệu cho " +"mailgraph. Chưa chắc thì để lại giá trị mặc định (/var/log/mail.log)." #. Type: boolean #. Description -#: ../mailgraph.templates:3001 -msgid "Ignore mail to/from localhost?" -msgstr "Bỏ qua thư tín đến/từ localhost ?" +#: ../templates:3001 +msgid "Count incoming mail as outgoing mail?" +msgstr "Đếm thư gửi đến như là thư gửi đi không?" #. Type: boolean #. Description -#: ../mailgraph.templates:3001 +#: ../templates:3001 msgid "" -"When using a content filter like amavis, incoming mail is counted more than " -"once, which will result in wrong values. If you use some content filter, you " -"should choose this option." +"If you count incoming mail as outgoing mail (default), mail is counted more " +"than once if you use content filters like amavis, so you'll get wrong " +"values. If you're using some content filter, disable this." msgstr "" -"Khi sử dụng một bộ lọc ngữ cảnh như amavis, mỗi thư gửi đến được đếm nhiều " -"lần mà có kết quả là giá trị sai. Có nên bật tùy chọn này nếu bạn sử dụng bộ " -"lọc ngữ cảnh nào." +"Nếu bạn đếm thư gửi đến là thư gửi đi (mặc định), mỗi thư được đếm nhiều lần " +"nếu bạn sử dụng bộ lọc nội dung như amavis: trong trường hợp đó, bạn sẽ thấy " +"giá trị không đúng. Vì vậy, nếu bạn đang dùng bộ lọc nội dung, hãy tắt tùy " +"chọn này." diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 0000000..d17f371 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,20 @@ +#!/bin/sh +if [ ! -f /etc/default/mailgraph ]; then + . /usr/share/debconf/confmodule + db_get mailgraph/start_on_boot + echo "BOOT_START=$RET" > /etc/default/mailgraph + db_get mailgraph/mail_log + echo "MAIL_LOG=$RET" >> /etc/default/mailgraph + db_get mailgraph/ignore_localhost + if [ "$RET" = "true" ] ; then + echo "IGNORE_LOCALHOST=false" >> /etc/default/mailgraph + else + echo "IGNORE_LOCALHOST=true" >> /etc/default/mailgraph + fi +fi +if [ ! -d /var/lib/mailgraph ]; then + mkdir /var/lib/mailgraph + chown www-data:www-data /var/lib/mailgraph +fi +#DEBHELPER# +exit 0 diff --git a/debian/postrm b/debian/postrm new file mode 100644 index 0000000..fab1b24 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "purge" ] ; then + rm -f /etc/default/mailgraph +fi +#DEBHELPER# +exit 0 diff --git a/debian/mailgraph.preinst b/debian/preinst index 729ecc5..0070083 100644 --- a/debian/mailgraph.preinst +++ b/debian/preinst @@ -12,13 +12,13 @@ set -e case "$1" in upgrade) if [ "$2" \< "1.13-1.1" ]; then - if [ -r /etc/default/mailgraph ]; then - . /usr/share/debconf/confmodule - . /etc/default/mailgraph - db_set mailgraph/start_on_boot "$BOOT_START" - db_set mailgraph/mail_log "$MAIL_LOG" - db_set mailgraph/ignore_localhost "$IGNORE_LOCALHOST" - fi + if [ -f /etc/default/mailgraph ]; then + . /usr/share/debconf/confmodule + . /etc/default/mailgraph + db_set mailgraph/start_on_boot "$BOOT_START" + db_set mailgraph/mail_log "$MAIL_LOG" + db_set mailgraph/ignore_localhost "$IGNORE_LOCALHOST" + fi fi ;; @@ -37,3 +37,5 @@ esac #DEBHELPER# exit 0 + + diff --git a/debian/rules b/debian/rules index 68fa942..8e83047 100755 --- a/debian/rules +++ b/debian/rules @@ -1,15 +1,84 @@ #!/usr/bin/make -f -%: - dh $@ - -override_dh_auto_configure: - ln mailgraph.pl mailgraph - cp -f -a mailgraph.cgi mailgraph.cgi.orig - sed -i -e 's/^<link rel="stylesheet" href="mailgraph.css" type="text\/css" \/>$$/<style type="text\/css">/' \ - -e '/<style type="text\/css">/r mailgraph.css' \ - -e '/<\/head>/i <\/style>' mailgraph.cgi - -override_dh_auto_clean: - rm -f mailgraph - [ ! -f mailgraph.cgi.orig ] || mv -f mailgraph.cgi.orig mailgraph.cgi - dh_auto_clean +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: patch configure-stamp + dh_testdir + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + debconf-updatepo + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + cp mailgraph.pl $(CURDIR)/debian/mailgraph/usr/sbin/mailgraph + cp mailgraph.cgi $(CURDIR)/debian/mailgraph/usr/lib/cgi-bin + chmod a+x $(CURDIR)/debian/mailgraph/usr/sbin/mailgraph + chmod a+x $(CURDIR)/debian/mailgraph/usr/lib/cgi-bin/mailgraph.cgi + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdebconf + dh_installdocs -n + dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime + dh_installinit + dh_installcron + dh_installman + dh_installinfo + dh_installchangelogs CHANGES + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure unpatch diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index 9cdfca9..0000000 --- a/debian/source/local-options +++ /dev/null @@ -1,2 +0,0 @@ -unapply-patches -abort-on-upstream-changes diff --git a/debian/mailgraph.templates b/debian/templates index 8d3c68e..788f57e 100644 --- a/debian/mailgraph.templates +++ b/debian/templates @@ -1,6 +1,5 @@ Template: mailgraph/start_on_boot Type: boolean -Default: true _Description: Should Mailgraph start on boot? Mailgraph can start on boot time as a daemon. Then it will monitor your Postfix logfile for changes. This is recommended. @@ -16,8 +15,8 @@ _Description: Logfile used by mailgraph: Template: mailgraph/ignore_localhost Type: boolean -Default: false -_Description: Ignore mail to/from localhost? - When using a content filter like amavis, incoming mail is counted more - than once, which will result in wrong values. - If you use some content filter, you should choose this option. +Default: true +_Description: Count incoming mail as outgoing mail? + If you count incoming mail as outgoing mail (default), mail is counted more + than once if you use content filters like amavis, so you'll get wrong values. + If you're using some content filter, disable this. diff --git a/debian/watch b/debian/watch deleted file mode 100644 index f5caab5..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://mailgraph.schweikert.ch/pub/mailgraph-(.*)\.tar\.gz |