[pkg-kolab] r1355 - in kolab-cyrus-imapd/trunk/debian: . examples patches po
Mathieu Parent
sathieu at alioth.debian.org
Sun Oct 4 13:00:55 UTC 2009
Author: sathieu
Date: 2009-10-04 13:00:53 +0000 (Sun, 04 Oct 2009)
New Revision: 1355
Added:
kolab-cyrus-imapd/trunk/debian/patches/0024-upstream-fix-sieve.dpatch
kolab-cyrus-imapd/trunk/debian/patches/0025-upstream-fix-cve-2009-3235.dpatch
kolab-cyrus-imapd/trunk/debian/patches/50-fix-imclient-manpage.dpatch
Removed:
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.linda
Modified:
kolab-cyrus-imapd/trunk/debian/README.Debian.database
kolab-cyrus-imapd/trunk/debian/changelog
kolab-cyrus-imapd/trunk/debian/compat
kolab-cyrus-imapd/trunk/debian/control
kolab-cyrus-imapd/trunk/debian/cyrus-makedirs
kolab-cyrus-imapd/trunk/debian/examples/mboxtocyrus
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.menu
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.lintian
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.templates
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-pop3d.install
kolab-cyrus-imapd/trunk/debian/kolab-cyrus-pop3d.links
kolab-cyrus-imapd/trunk/debian/patches/00list
kolab-cyrus-imapd/trunk/debian/po/cs.po
kolab-cyrus-imapd/trunk/debian/po/de.po
kolab-cyrus-imapd/trunk/debian/po/es.po
kolab-cyrus-imapd/trunk/debian/po/eu.po
kolab-cyrus-imapd/trunk/debian/po/fi.po
kolab-cyrus-imapd/trunk/debian/po/fr.po
kolab-cyrus-imapd/trunk/debian/po/gl.po
kolab-cyrus-imapd/trunk/debian/po/it.po
kolab-cyrus-imapd/trunk/debian/po/ja.po
kolab-cyrus-imapd/trunk/debian/po/nb.po
kolab-cyrus-imapd/trunk/debian/po/nl.po
kolab-cyrus-imapd/trunk/debian/po/pt.po
kolab-cyrus-imapd/trunk/debian/po/pt_BR.po
kolab-cyrus-imapd/trunk/debian/po/ru.po
kolab-cyrus-imapd/trunk/debian/po/sv.po
kolab-cyrus-imapd/trunk/debian/po/templates.pot
kolab-cyrus-imapd/trunk/debian/po/vi.po
kolab-cyrus-imapd/trunk/debian/rules
Log:
* Synced against cyrus-imapd package
* Fix and acknowledge NMU for "CVE-2009-2632: Buffer overflow in the SIEVE
script component" (Closes: #547712)
Modified: kolab-cyrus-imapd/trunk/debian/README.Debian.database
===================================================================
--- kolab-cyrus-imapd/trunk/debian/README.Debian.database 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/README.Debian.database 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,5 +1,5 @@
Cyrus IMAP for Debian: Database backend conversion
-$Id: README.Debian.database 728 2007-06-19 15:18:11Z astronut $
+$Id: README.Debian.database 805 2009-09-07 07:36:52Z sven $
--------------------------------------------------
"All systems administrators have their horror stories. For me, it was
@@ -65,6 +65,9 @@
You should look for lines with 'berkeley' or 'berkeley_nosync' on
the right side. You can safely ignore lines with 'flat', 'skiplist' or
'quotalegacy'.
+ The db*_upgrade utility (along with its manpage) is typically included
+ in the db*-util packages (for example, db4.7-util package for BerkeleyDB
+ 4.7s db4.7_upgrade).
The SUBS and SEEN databases are different: there are many of them (one
for every user for SEEN and SUBS respectively) and you need to convert
@@ -120,15 +123,10 @@
4. Start Cyrus, if not started by step 3
/etc/init.d/cyrus2.2 start
-WHY THERE IS NO AUTOMATED UPGRADE SCRIPT: Because I dislike people who do not
-read docs, and one Debian user asked me exactly the wrong thing (about
-cyrus21-imapd) while I was in the middle of writing said script AND I am quite
-short on time lately: it is much faster to write a doc than to write and test
-the script. So, now everyone will need to read the docs to get Cyrus working
-again. I am not holding back the skiplist change for that script anymore.
+WHY THERE IS NO AUTOMATED UPGRADE SCRIPT: Because we are quite short on time
+lately: it is much faster to write a doc than to write and test the script.
-Maybe someday I will finish the upgrade script. Maybe someone else will write
-one (I will certainly include it in the package, if it is good enough). Don't
-hold your breath, though.
+Maybe someone will write one (We will certainly include it in the package, if
+it is good enough). Don't hold your breath, though.
- -- Henrique de Moraes Holschuh <hmh at debian.org>
+ - Your cyrus-imapd team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
Modified: kolab-cyrus-imapd/trunk/debian/changelog
===================================================================
--- kolab-cyrus-imapd/trunk/debian/changelog 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/changelog 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,5 +1,8 @@
kolab-cyrus-imapd (2.2.13-6) unstable; urgency=low
+ * Synced against cyrus-imapd package
+ * Fix and acknowledge NMU for "CVE-2009-2632: Buffer overflow in the SIEVE
+ script component" (Closes: #547712)
* Added me as uploader
* debian/control:
- Prefix packages descriptions by "Kolab "
@@ -7,8 +10,75 @@
- Added Recommends and Suggests (based on cyrus-imapd-2.2)
* Get closer to cyrus-imapd-2.2: cyrus.conf
- -- Mathieu Parent <sathieu at debian.org> Sun, 04 Oct 2009 13:18:17 +0200
+ -- Mathieu Parent <sathieu at debian.org> Sun, 04 Oct 2009 14:56:07 +0200
+cyrus-imapd-2.2 (2.2.13-17) unstable; urgency=high
+
+ * Security Update: CVE-2009-3235:
+ Multiple stack-based buffer overflows in the Sieve parsing code,
+ patches taken from upstream CVS (closes: #547947)
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org> Tue, 22 Sep 2009 17:17:17 -0300
+
+cyrus-imapd-2.2 (2.2.13-16) unstable; urgency=high
+
+ * Justification for high urgency: Get security update from -15 into
+ testing as fast as possible since -15 was removed before it could
+ migrate.
+ * Fix build dependency on tcl-dev (keeping old tcl8.3-dev to make
+ backports easier) (Closes: 545281)
+ * Fix up README.Debian.database (Closes: 543293)
+ * Build against newer cyrus-sasl (Closes: 527495,528468)
+ * Fix cyrus-common postinst to only run makedirs if a new upstream
+ is installed (Closes: 545512), add a README to note that the
+ postinst needs to be changed with each new upstream
+ * Fix find syntax in cyrus-makedirs (Closes: 545554)
+
+ -- Sven Mueller <sven at debian.org> Tue, 08 Sep 2009 10:04:14 +0200
+
+cyrus-imapd-2.2 (2.2.13-15) unstable; urgency=high
+
+ [Security Update]
+ * Fixes buffer overflow in SIEVE script handling -> high urgency
+ Problem has no CVE tag assigned, is not yet announced by upstream,
+ but upstream patch is in public CVS -> not embargoed.
+
+ [Sven Mueller]
+ * change example script mbox2cyrus to remove bashisms (Closes: #489558,
+ thanks to Andres Mejia)
+ * change Makefile so that no (intended) non-phony target invokes a phony
+ target. Also remove empty lines inside rules or replace them by comment
+ lines
+ * Added patches for translation updates as provided by Christian Perrier
+ (see below)
+ * update cyrus-makedirs to be more performant (using xargs to call chmod
+ et al. instead of using find -exec, this avoids lots of forks)
+ * remove build dependency alternate libsnmp5-dev (not even in oldstable
+ anymore), add alternative libsnmp-dev (as in stable)
+ * update standards-version to 3.8.3.0
+ - add README.source
+ - remove version from perl build dependency
+
+ [ Christian Perrier ]
+ * Debconf templates and debian/control reviewed by the debian-l10n-
+ english team as part of the Smith review project. Closes: #523989
+ * [Debconf translation updates]
+ - Swedish. Closes: #524090
+ - Czech. Closes: #524092
+ - Japanese. Closes: #524121
+ - Russian. Closes: #525704
+ - Portuguese. Closes: #525912
+ - German. Closes: #525913
+ - Galician. Closes: #524267
+ - Italian. Closes: #524312
+ - French. Closes: #524954
+ - Finnish. Closes: #526182
+ - Bokmål, Norwegian. Closes: #526231
+ - Spanish. Closes: #526358
+ - Basque. Closes: #530856
+
+ -- Sven Mueller <sven at debian.org> Fri, 04 Sep 2009 09:58:54 +0200
+
kolab-cyrus-imapd (2.2.13-5) unstable; urgency=low
* Synced against cyrus-imapd package (closes: #475128)
Modified: kolab-cyrus-imapd/trunk/debian/compat
===================================================================
--- kolab-cyrus-imapd/trunk/debian/compat 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/compat 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1 +1 @@
-4
+5
Modified: kolab-cyrus-imapd/trunk/debian/control
===================================================================
--- kolab-cyrus-imapd/trunk/debian/control 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/control 2009-10-04 13:00:53 UTC (rev 1355)
@@ -3,11 +3,11 @@
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>, Mathieu Parent <sathieu at debian.org>
-Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 4.1.68), dpatch, tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, transfig, gs, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev, libldap2-dev
+Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5), dpatch, tcl-dev | tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev | libsnmp9-dev, perl, xutils-dev | xutils, flex, bison, autotools-dev, po-debconf, transfig, ghostscript | gs-gpl, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev, libldap2-dev
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/kolab-cyrus-imapd/trunk/
Vcs-Svn: svn://svn.debian.org/pkg-kolab/kolab-cyrus-imapd/trunk/
-Homepage: http://asg.web.cmu.edu/cyrus/
+Homepage: http://cyrusimap.web.cmu.edu/
Package: kolab-cyrus-common
Architecture: any
@@ -18,79 +18,107 @@
Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus21-common, cyrus22-common, cyrus-common-2.2
Replaces: cyrus21-common, cyrus22-common, cyrus-common-2.2
Provides: cyrus21-common, cyrus22-common, cyrus-common-2.2
-Description: Kolab Cyrus mail system (common files)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
- o Designed to handle massive quantities of mail
- o No need for users to have login accounts
- o Virtual domain support
- o Support for POP3 in addition to IMAP
- o Sieve server-side email filtering
- o Servers don't run as root
- o Easy support for mail quotas
- o SSL support, including secure IMAP
- o DRAC support for pop/imap-before-smtp
- o IPv6 support
- For more information, see http://asg.web.cmu.edu/cyrus/.
+Description: Kolab Cyrus mail system - common files
+ Cyrus is an IMAP server designed to handle massive quantities of mail,
+ with a number of features not found in other IMAP implementations,
+ including support for:
+ - running the daemon without root privileges;
+ - POP3 in addition to plain IMAP;
+ - POP/IMAP-before-SMTP using DRAC;
+ - secure IMAP using SSL;
+ - server-side filtering with Sieve;
+ - mail users without login accounts;
+ - simple mail quotas;
+ - virtual domains;
+ - IPv6.
.
- Note: Cyrus doesn't support reading from and storing mail in your
- standard mail spool - it stores mail in a separate directory in its
+ Cyrus doesn't support reading from and storing mail in the
+ standard mail spool. It stores mail in a separate directory in its
own MH-like format.
.
This package contains the common files needed by the other Cyrus
components. The kolab-cyrus-imapd and/or kolab-cyrus-pop3d packages are needed
to enable IMAP and POP3 support respectively.
- .
- Homepage: http://cyrusimap.web.cmu.edu/
Package: kolab-cyrus-imapd
Architecture: any
Section: mail
-Depends: kolab-cyrus-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: kolab-cyrus-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Provides: imap-server, cyrus21-imapd, cyrus22-imapd, cyrus-imapd-2.2
Conflicts: imap-server, cyrus21-imapd, cyrus22-imapd, cyrus-imapd-2.2
Replaces: cyrus21-imapd, cyrus22-imapd, cyrus-imapd-2.2
-Description: Kolab Cyrus mail system (IMAP support)
- This package contains the IMAP (Internet Mail Access Protocol) portion
+Description: Kolab Cyrus mail system - IMAP support
+ Cyrus is an IMAP server designed to handle massive quantities of mail,
+ with a number of features not found in other IMAP implementations,
+ including support for:
+ - running the daemon without root privileges;
+ - POP3 in addition to plain IMAP;
+ - POP/IMAP-before-SMTP using DRAC;
+ - secure IMAP using SSL;
+ - server-side filtering with Sieve;
+ - mail users without login accounts;
+ - simple mail quotas;
+ - virtual domains;
+ - IPv6.
+ .
+ This package contains the IMAP (Internet Mail Access Protocol) portion
of the Cyrus IMAPd suite.
- .
- For more information, please see the kolab-cyrus-common package.
-
Package: kolab-cyrus-pop3d
Architecture: any
Section: mail
-Depends: kolab-cyrus-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: kolab-cyrus-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Provides: cyrus21-pop3d, cyrus22-pop3d, pop3-server, cyrus-pop3d-2.2
Conflicts: cyrus21-pop3d, cyrus22-pop3d, pop3-server, cyrus-pop3d-2.2
Replaces: cyrus21-pop3d, cyrus22-pop3d, cyrus-pop3d-2.2
-Description: Kolab Cyrus mail system (POP3 support)
+Description: Kolab Cyrus mail system - POP3 support
+ Cyrus is an IMAP server designed to handle massive quantities of mail,
+ with a number of features not found in other IMAP implementations,
+ including support for:
+ - running the daemon without root privileges;
+ - POP3 in addition to plain IMAP;
+ - POP/IMAP-before-SMTP using DRAC;
+ - secure IMAP using SSL;
+ - server-side filtering with Sieve;
+ - mail users without login accounts;
+ - simple mail quotas;
+ - virtual domains;
+ - IPv6.
+ .
This package contains the POP3 (Post Office Protocol) portion of the Cyrus
IMAPd suite.
- .
- For more information, please see the kolab-cyrus-common package.
Package: kolab-cyrus-admin
Architecture: all
Section: mail
-Depends: kolab-libcyrus-imap-perl (>= ${source:Version})
+Depends: kolab-libcyrus-imap-perl (>= ${source:Version}), ${misc:Depends}
Suggests: sasl2-bin
Conflicts: cyrus-admin, cyrus21-admin, cyrus22-admin, cyrus-admin-2.2
Replaces: cyrus21-admin, cyrus22-admin, cyrus-admin-2.2
Provides: cyrus21-admin, cyrus22-admin, cyrus-admin-2.2
-Description: Kolab Cyrus mail system (administration tools)
+Description: Kolab Cyrus mail system - administration tools
+ Cyrus is an IMAP server designed to handle massive quantities of mail,
+ with a number of features not found in other IMAP implementations,
+ including support for:
+ - running the daemon without root privileges;
+ - POP3 in addition to plain IMAP;
+ - POP/IMAP-before-SMTP using DRAC;
+ - secure IMAP using SSL;
+ - server-side filtering with Sieve;
+ - mail users without login accounts;
+ - simple mail quotas;
+ - virtual domains;
+ - IPv6.
+ .
This package provides the administrative tools for the Cyrus IMAPd suite.
- It contains the cyradm tool which can be used to administer
- both local and remote Cyrus mail systems. It also contains sieveshell
- and its deprecated cousin installsieve, which can be used to manage
- sieve scripts.
- .
- For more information, please see the kolab-cyrus-common package.
+ It contains cyradm, which can be used to administer both local and remote
+ Cyrus mail systems, plus sieveshell (and its deprecated cousin
+ installsieve), which can be used to manage Sieve scripts.
Package: kolab-cyrus-clients
Architecture: any
Section: mail
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: cyrus21-clients, cyrus22-clients, cyrus-clients-2.2
Provides: cyrus21-clients, cyrus22-clients, cyrus-clients-2.2
Replaces: cyrus21-clients, cyrus22-clients, cyrus-clients-2.2
@@ -98,15 +126,14 @@
This package contains client tools to test the Cyrus IMAPd suite.
It contains the mupdatetest, sivtest, smtptest, lmtptest,
imtest and pop3test tools which can be used to interactively talk to
- a mupdate, sieve, smtp, lmtp, imap or pop3 server.
+ a mupdate, Sieve, SMTP, LMTP, IMAP or POP3 server.
The clients are fully SASL-enabled for authentication.
.
For more information, please see the kolab-cyrus-common package.
-
Package: kolab-libcyrus-imap-perl
Architecture: any
-Depends: ${perl:Depends}, ${shlibs:Depends}
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: libcyrus-imap-perl, libcyrus-imap-perl21, libcyrus-imap-perl22
Conflicts: libcyrus-imap-perl, libcyrus-imap-perl21, libcyrus-imap-perl22
Replaces: libcyrus-imap-perl21, libcyrus-imap-perl22
@@ -122,4 +149,4 @@
undocumented upstream.
.
For more information, please see the kolab-cyrus-common package.
-
+
Modified: kolab-cyrus-imapd/trunk/debian/cyrus-makedirs
===================================================================
--- kolab-cyrus-imapd/trunk/debian/cyrus-makedirs 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/cyrus-makedirs 2009-10-04 13:00:53 UTC (rev 1355)
@@ -6,7 +6,7 @@
# Copyright 2001,2002 by Henrique de Moraes Holschuh <hmh at debian.org.
# Released under the terms of the GNU General Public License (GPL) version 2
#
-# $Id: cyrus-makedirs 750 2007-12-17 02:53:15Z astronut $
+# $Id: cyrus-makedirs 793 2009-09-03 09:35:11Z sven $
# See lib/util.c, dir_hash_c for Cyrus' directory hashing
# for the new hash style
@@ -89,7 +89,7 @@
[ -d "$confdir/$i/$j" ] || mkdir "$confdir/$i/$j"
done
done
-find "$confdir" -print0 \( -not -user cyrus -or -not -group mail \) | xargs -r -0 chown cyrus:mail
+find "$confdir" \( -not -user cyrus -or -not -group mail \) -print0 | xargs -r -0 chown cyrus:mail
# Now, create the spool partitions
for i in $partitions ; do
@@ -102,9 +102,9 @@
done
}
[ -d "$i/stage." ] || mkdir "$i/stage."
- find "$i" -print0 \( -not -user cyrus -or -not -group mail \) | xargs -r -0 chown cyrus:mail
+ find "$i" \( -not -user cyrus -or -not -group mail \) -print0 | xargs -r -0 chown cyrus:mail
# and kill any squatter indexes
- [ $killsquat -ne 0 ] && find "$i" -name 'cyrus.squat' -type f -exec rm -f "{}" \;
+ [ $killsquat -ne 0 ] && find "$i" -name 'cyrus.squat' -type f -print0 | xargs -r -0 rm -f
done
# And the sieve directory structure
@@ -115,7 +115,7 @@
[ -d "$sievedir/$j" ] || mkdir "$sievedir/$j"
chmod 755 "$sievedir/$j"
done
- find "$sievedir" -print0 \( -not -user cyrus -or -not -group mail \) | xargs -r -0 chown cyrus:mail
+ find "$sievedir" \( -not -user cyrus -or -not -group mail \) -print0 | xargs -r -0 chown cyrus:mail
}
[ "x${CYRUSOPTFILESYS}" != "x1" ] && exit 0
@@ -133,11 +133,11 @@
case ${i} in
ext2)
echo "Setting attributes to +S for ${partsys%% *}..."
- find "${partsys%% *}" -type d -exec chattr +S "{}" \;
+ find "${partsys%% *}" -type d -print0 | xargs -r -0 chattr +S
;;
ext3)
echo "Setting attributes to -S -j for ${partsys%% *}..."
- find "${partsys%% *}" -type d -exec chattr -S -j "{}" \;
+ find "${partsys%% *}" -type d -print0 | xargs -r -0 chattr -S -j
;;
esac
partsys="${partsys#* }"
Modified: kolab-cyrus-imapd/trunk/debian/examples/mboxtocyrus
===================================================================
--- kolab-cyrus-imapd/trunk/debian/examples/mboxtocyrus 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/examples/mboxtocyrus 2009-10-04 13:00:53 UTC (rev 1355)
@@ -54,11 +54,11 @@
-if [ "$MAILBOX" == "" ]; then
+if [ "$MAILBOX" = "" ]; then
MAILBOX=$USER
fi
-if [ "$CYRUSFOLDER" == "" ]; then
+if [ "$CYRUSFOLDER" = "" ]; then
echo "Adding mailbox '$MAILBOX' to Cyrus INBOX of user '$USER'..."
$FORMAIL -I "From " < $MAILBOX -s $CYRDELIVER $USER
else
Deleted: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.linda
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.linda 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.linda 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,2 +0,0 @@
-Tag: interp-minus-n-fails
-Data: usr/bin/cyradm
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.menu
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.menu 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-admin.menu 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,4 +1,4 @@
-?package(kolab-cyrus-admin):needs="text" section="Apps/System/Admin"\
+?package(kolab-cyrus-admin):needs="text" section="Applications/System/Administration"\
hints="Mail,Admin,Cyrus"\
title="Cyrus 2.2 cyradm (cyrus at localhost)"\
longtitle="Administer local Cyrus IMAPd 2.2 accounts as user cyrus"\
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.lintian
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.lintian 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.lintian 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,2 +1,4 @@
kolab-cyrus-common: no-debconf-config
kolab-cyrus-common: postinst-uses-db-input
+kolab-cyrus-common: dir-or-file-in-var-run var/run/cyrus/
+kolab-cyrus-common: dir-or-file-in-var-run var/run/cyrus/socket/
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.postinst 2009-10-04 13:00:53 UTC (rev 1355)
@@ -2,7 +2,7 @@
# postinst script for kolab-cyrus-common
# Copyright (c) 2002 by Henrique de Moraes Holschuh
# Distributed under the GNU General Public License version 2
-# $Id: cyrus-common-2.2.postinst 503 2006-07-18 15:30:27Z sven $
+# $Id: cyrus-common-2.2.postinst 825 2009-09-08 08:22:44Z sven $
#
# see: dh_installdeb(1)
@@ -92,7 +92,11 @@
# Parse imapd.conf and generate all required directories...
# also kill any left over squatter indexes
- /usr/sbin/cyrus-makedirs --cleansquat
+ # only run if old upstream version is lower than the new upstream
+ # version (or if its a fresh install)
+ if [ "$2" = "" ] || dpkg --compare-versions "$( echo $2 | cut -d- -f2)" lt "2.2.13" ; then
+ cyrus-makedirs --cleansquat
+ fi
# Deal with database type information
if [ -f /usr/lib/cyrus/cyrus-db-types.active ] ; then
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.templates
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.templates 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-common.templates 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,6 +1,15 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
Template: kolab-cyrus-common/warnbackendchange
-Type: note
-_Description: Database backends have changed!
+Type: error
+_Description: Modified database backends
Comparison between /usr/lib/cyrus/cyrus-db-types.txt and
/usr/lib/cyrus/cyrus-db-types.active shows that database backends for
Cyrus IMAPd have been changed.
@@ -17,7 +26,7 @@
Type: boolean
Default: false
_Description: Remove the mail and news spools?
- The Cyrus mail and news spools, as well as the user's sieve scripts
+ The Cyrus mail and news spools, as well as users' sieve scripts,
can be removed when the package is purged.
.
This question only applies to the default spools and sieve script
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-pop3d.install
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-pop3d.install 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-pop3d.install 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,3 +1,2 @@
-usr/sbin/pop3*
usr/lib/cyrus/bin/pop3d
usr/share/man/man8/pop3d*
Modified: kolab-cyrus-imapd/trunk/debian/kolab-cyrus-pop3d.links
===================================================================
--- kolab-cyrus-imapd/trunk/debian/kolab-cyrus-pop3d.links 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/kolab-cyrus-pop3d.links 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1 +1,2 @@
usr/share/doc/kolab-cyrus-common usr/share/doc/kolab-cyrus-pop3d
+
Added: kolab-cyrus-imapd/trunk/debian/patches/0024-upstream-fix-sieve.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0024-upstream-fix-sieve.dpatch (rev 0)
+++ kolab-cyrus-imapd/trunk/debian/patches/0024-upstream-fix-sieve.dpatch 2009-10-04 13:00:53 UTC (rev 1355)
@@ -0,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0024-upstream-fix-sieve.dpatch by Sven Mueller <sven at debian.org>
+##
+## DP: Upstream patch fixing a buffer overflow bug in sieve
+## DP: Taken from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sieve/script.c.diff?r1=1.62&r2=1.62.2.1
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/sieve/script.c cyrus-imapd-2.2.13/sieve/script.c
+--- cyrus-imapd-2.2.13~/sieve/script.c 2009-09-03 10:51:31.000000000 +0200
++++ cyrus-imapd-2.2.13/sieve/script.c 2009-09-03 11:16:34.831047555 +0200
+@@ -546,7 +546,7 @@
+ ret |= keep_ret;
+ if (keep_ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Kept\n");
+ else {
+ implicit_keep = 0; /* don't try an implicit keep again */
+@@ -599,7 +599,7 @@
+
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Rejected with: %s\n", a->u.rej.msg);
+
+ break;
+@@ -615,7 +615,7 @@
+
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Filed into: %s\n",a->u.fil.mailbox);
+ break;
+ case ACTION_KEEP:
+@@ -629,7 +629,7 @@
+ &errmsg);
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Kept\n");
+ break;
+ case ACTION_REDIRECT:
+@@ -643,7 +643,7 @@
+ &errmsg);
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Redirected to %s\n", a->u.red.addr);
+ break;
+ case ACTION_DISCARD:
+@@ -655,7 +655,7 @@
+ &errmsg);
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Discarded\n");
+ break;
+
+@@ -689,12 +689,12 @@
+
+ if (ret == SIEVE_OK)
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Sent vacation reply\n");
+
+ } else if (ret == SIEVE_DONE) {
+ snprintf(actions_string+strlen(actions_string),
+- sizeof(actions_string)-strlen(actions_string),
++ ACTIONS_STRING_LEN-strlen(actions_string),
+ "Vacation reply suppressed\n");
+
+ ret = SIEVE_OK;
Added: kolab-cyrus-imapd/trunk/debian/patches/0025-upstream-fix-cve-2009-3235.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/0025-upstream-fix-cve-2009-3235.dpatch (rev 0)
+++ kolab-cyrus-imapd/trunk/debian/patches/0025-upstream-fix-cve-2009-3235.dpatch 2009-10-04 13:00:53 UTC (rev 1355)
@@ -0,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0025_upstream-fix-cve-2009-3235.dpatch by Henrique de Moraes Holschuh <hmh at debian.org>
+##
+## DP: Fixes for CVE 2009-3235 (multiple Sieve buffer overruns, remote exploitable)
+## DP: taken from upstream CVS, Debian bug #547947
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13~/sieve/bc_eval.c cyrus-imapd-2.2.13/sieve/bc_eval.c
+--- cyrus-imapd-2.2.13~/sieve/bc_eval.c 2009-09-22 18:47:23.000000000 -0300
++++ cyrus-imapd-2.2.13/sieve/bc_eval.c 2009-09-22 18:57:26.479167505 -0300
+@@ -440,7 +440,7 @@
+ int comparator=ntohl(bc[i+3].value);
+ int apart=ntohl(bc[i+4].value);
+ int count=0;
+- char scount[3];
++ char scount[21];
+ int isReg = (match==B_REGEX);
+ int ctag = 0;
+ regex_t *reg;
+@@ -608,7 +608,7 @@
+ int relation=ntohl(bc[i+2].value);
+ int comparator=ntohl(bc[i+3].value);
+ int count=0;
+- char scount[3];
++ char scount[21];
+ int isReg = (match==B_REGEX);
+ int ctag = 0;
+ regex_t *reg;
+diff -urNad cyrus-imapd-2.2.13~/sieve/script.c cyrus-imapd-2.2.13/sieve/script.c
+--- cyrus-imapd-2.2.13~/sieve/script.c 2009-09-22 18:57:09.666668946 -0300
++++ cyrus-imapd-2.2.13/sieve/script.c 2009-09-22 18:57:26.479167505 -0300
+@@ -526,9 +526,9 @@
+ if ((ret != SIEVE_OK) && interp->err) {
+ char buf[1024];
+ if (lastaction == -1) /* we never executed an action */
+- sprintf(buf, "%s", errmsg ? errmsg : sieve_errstr(ret));
++ snprintf(buf, sizeof(buf), "%s", errmsg ? errmsg : sieve_errstr(ret));
+ else
+- sprintf(buf, "%s: %s", action_to_string(lastaction),
++ snprintf(buf, sizeof(buf), "%s: %s", action_to_string(lastaction),
+ errmsg ? errmsg : sieve_errstr(ret));
+
+ ret |= interp->execute_err(buf, interp->interp_context,
+diff -urNad cyrus-imapd-2.2.13~/sieve/sieve.y cyrus-imapd-2.2.13/sieve/sieve.y
+--- cyrus-imapd-2.2.13~/sieve/sieve.y 2009-09-22 18:47:23.000000000 -0300
++++ cyrus-imapd-2.2.13/sieve/sieve.y 2009-09-22 18:57:26.479167505 -0300
+@@ -923,7 +923,7 @@
+ else if (!strcmp(r, "ne")) {return NE;}
+ else if (!strcmp(r, "eq")) {return EQ;}
+ else{
+- sprintf(errbuf, "flag '%s': not a valid relational operation", r);
++ snprintf(errbuf, sizeof(errbuf), "flag '%s': not a valid relational operation", r);
+ yyerror(errbuf);
+ return -1;
+ }
Modified: kolab-cyrus-imapd/trunk/debian/patches/00list
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/00list 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/patches/00list 2009-10-04 13:00:53 UTC (rev 1355)
@@ -22,6 +22,8 @@
0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
0022-upstream-dont-send-empty-literal-response.dpatch
0023-sort-illegal-dates-first.dpatch
+0024-upstream-fix-sieve.dpatch
+0025-upstream-fix-cve-2009-3235.dpatch
0090-fix-casts.dpatch
01-fix_Makefile.in.dpatch
02-add_mkinstalldirs.dpatch
@@ -51,6 +53,7 @@
35-masssievec_remove_unused_variable.dpatch
40-rehash_fix_pathes.dpatch
45-kolab2-annotations.dpatch
+50-fix-imclient-manpage
61-64bit-quota.dpatch
65-sieveshell-enhancements.dpatch
70-fix_readme_link.dpatch
Added: kolab-cyrus-imapd/trunk/debian/patches/50-fix-imclient-manpage.dpatch
===================================================================
--- kolab-cyrus-imapd/trunk/debian/patches/50-fix-imclient-manpage.dpatch (rev 0)
+++ kolab-cyrus-imapd/trunk/debian/patches/50-fix-imclient-manpage.dpatch 2009-10-04 13:00:53 UTC (rev 1355)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-fix-imclient-manpage.dpatch by Sven Mueller <sven at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix formatting of imclient manpage
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2-2.2.13~/man/imclient.3 cyrus-imapd-2.2-2.2.13/man/imclient.3
+--- cyrus-imapd-2.2-2.2.13~/man/imclient.3 2005-04-11 07:48:28.000000000 +0200
++++ cyrus-imapd-2.2-2.2.13/man/imclient.3 2009-09-08 09:24:19.651356667 +0200
+@@ -41,7 +41,7 @@
+ .\" $Id: imclient.3,v 1.11 2005/04/11 05:48:28 shadow Exp $
+
+ .SH NAME
+-imclient library - authenticating callback interface to IMAP/IMSP servers
++imclient \- (library) authenticating callback interface to IMAP/IMSP servers
+ .SH SYNOPSIS
+ .ad l
+ .ft B
Modified: kolab-cyrus-imapd/trunk/debian/po/cs.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/cs.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/cs.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -4,24 +4,24 @@
msgid ""
msgstr ""
"Project-Id-Version: cyrus-imapd-2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
-"PO-Revision-Date: 2006-08-15 20:02+0200\n"
-"Last-Translator: Martin Sin <martin.sin at seznam.cz>\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-14 20:28+0200\n"
+"Last-Translator: Martin Sin <martin.sin at zshk.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "Backendy databáze se změnily!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Upravené databázové backendy"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
@@ -30,9 +30,9 @@
"Srovnánà mezi /usr/lib/cyrus/cyrus-db-types.txt a /usr/lib/cyrus/cyrus-db-"
"types.active ukázalo, že se změnil backend databáze pro Cyrus IMAPd."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
@@ -41,9 +41,9 @@
"To znamená, že ty databáze, u kterých se databázové backendy změnily, budou "
"možná vyžadovat ruÄnà pÅ™evod do nového formátu utilitou cvt_cyrusdb(8)."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -55,15 +55,15 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr "Odstranit spool adresáře pošty a news?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
"PÅ™i odstranÄ›nà balÃku mohou být smazány i spool adresáře s poÅ¡tou a news "
@@ -71,7 +71,7 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
@@ -80,3 +80,6 @@
"Tato otázka se týká pouze výchozÃch spool adresářů a Sieve skriptů ve /var. "
"PÅ™i zmÄ›nÄ› jejich umÃstÄ›nà v imapd.conf nebude odstranÄ›no jejich nové "
"umÃstÄ›nÃ, ale pouze jejich staré ve /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Backendy databáze se změnily!"
Modified: kolab-cyrus-imapd/trunk/debian/po/de.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/de.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/de.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,40 +1,29 @@
# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
-# translation of cyrus22-imapd_2.1.16-6_de.po to German
-# translation of cyrus22-imapd_2.1.16-6_templates.po to German
+# translation of cyrus-imapd_2.2 2.2.13-15_de.po to German
#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-# Developers do not need to manually edit POT or PO files.
-# Erik Schanze <mail at erikschanze.de>, 2004.
-#
+# Erik Schanze <eriks at debian.org>, 2004-2009.
msgid ""
msgstr ""
-"Project-Id-Version: cyrus-imapd-2.2_2.2.12-1_de\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
-"PO-Revision-Date: 2004-05-29 22:44+0200\n"
-"Last-Translator: Sven Mueller <sven at debian.org>\n"
+"Project-Id-Version: cyrus-imapd_2.2 2.2.13-15_de\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-27 22:30+0200\n"
+"Last-Translator: Erik Schanze <eriks at debian.org>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
+"X-Generator: KBabel 1.11.4\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "Datenbankanbindungen haben sich geändert!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Datenbankanbindungen geändert"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
@@ -44,9 +33,9 @@
"cyrus/cyrus-db-types.active zeigt, dass die Datenbankanbindungen des Cyrus "
"IMAPd geändert wurden."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
@@ -56,43 +45,44 @@
"Hilfsprogramm cvt_cyrusdb(8) gegebenenfalls manuell in das neue Format "
"überführt werden."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
"databases to the new format."
msgstr ""
"Mehr Informationen finden Sie in der Datei /usr/share/doc/kolab-cyrus-common/"
-"README.Debian.database. Starten Sie keinesfalls cyrmaster, bevor Sie die "
+"README.Debian.database. Starten Sie keinesfalls »cyrmaster«, bevor Sie die "
"Datenbank in das neue Format überführt haben."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
-msgstr "Mail- und News-Spools entfernen?"
+msgstr "E-Mail- und News-Zwischenspeicher entfernen?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
-"Die Cyrus Email- bzw. News-Spools und die Filterskripte (Sieve Skripte) der "
-"Benutzer können gelöscht werden, wenn das Paket restlos entfernt wird "
-"(purge)."
+"Die Zwischenspeicher von Cyrus für E-Mail und News, sowie die Filterskripte "
+"(Sieve-Skripte) der Benutzer, können gelöscht werden, wenn das Paket restlos "
+"entfernt wird (purge)."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
"locations will not be removed; just the old ones in /var."
msgstr ""
-"Diese Frage betrifft nur die Standard-Spools und -Filterskriptverzeichnisse "
-"in /var. Wenn Sie deren Ort in der Datei imapd.conf geändert haben, werden "
-"sie an der neuen Stelle nicht gelöscht, nur an der Alten im Verzeichnis /var."
+"Diese Frage betrifft nur die Standard-Zwischenspeicher und -"
+"Filterskriptverzeichnisse in /var. Wenn Sie deren Ort in der Datei imapd."
+"conf geändert haben, werden sie an den neuen Stellen nicht gelöscht, nur an "
+"den alten im Verzeichnis /var."
Modified: kolab-cyrus-imapd/trunk/debian/po/es.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/es.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/es.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,109 +1,115 @@
# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
# cyrus-imapd-2.2 po-debconf translation to Spanish
-# Copyright (C) 2006 Software in the Public Interest
+# Copyright (C) 2006, 2009 Software in the Public Interest
# This file is distributed under the same license as the cyrus-imapd-2.2 package.
#
# Changes:
-# - Initial translation
-# César Gómez MartÃn <cesar.gomez at gmail.com>
+# - Initial translation
+# César Gómez MartÃn <cesar.gomez at gmail.com>, 2006
#
-# 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'
+# - Updates
+# Francisco Javier Cuadrado <fcocuadrado at gmail.com>, 2009
+#
+# 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 de traducción en
-# http://www.debian.org/intl/spanish/notas
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/
+# especialmente las notas 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
+# - 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: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: César Gómez MartÃn <cesar.gomez at gmail.com>\n"
+"Project-Id-Version: cyrus-imapd-2.2 2.2.13-15\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-27 10:51+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
"Language-Team: Debian l10n spanish <debian-l10n-spanish at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-SourceCharset: utf-8\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "¡Los gestores de la base de datos han cambiado!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Gestores de base de datos modificados"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
"changed."
msgstr ""
-"La comparación entre /usr/lib/cyrus/cyrus-db-types.txt y /usr/lib/cyrus/"
-"cyrus-db-types.active muestra que el gestor de Cyrus IMAPd se ha cambiado."
+"La comparación entre «/usr/lib/cyrus/cyrus-db-types.txt» y «/usr/lib/cyrus/"
+"cyrus-db-types.active» muestra que se han cambiado los gestores de base de "
+"datos de Cyrus IMAPd."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
"(8) utility."
msgstr ""
-"Esto significa que quizás se necesite convertir manualmente al nuevo formato "
-"las bases de datos para las que ha cambiado el gestor, para ello puede usar "
-"la utilidad cvt_cyrusdb(8)."
+"Esto significa que, quizás, se necesite convertir manualmente al nuevo "
+"formato las bases de datos para las que ha cambiado el gestor, para ello "
+"puede usar la herramienta cvt_cyrusdb(8)."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
"databases to the new format."
msgstr ""
-"Por favor, consulte /usr/share/doc/kolab-cyrus-common/README.Debian.database "
-"si desea más información. No arranque cyrmaster hasta que haya convertido "
-"las bases de datos al nuevo formato."
+"Por favor, consulte «/usr/share/doc/kolab-cyrus-common/README.Debian."
+"database» si desea más información. No ejecute cyrmaster hasta que se hayan "
+"convertido las bases de datos al nuevo formato."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
-msgstr "¿Quiere eliminar el correo y las colas de noticias?"
+msgstr "¿Desea eliminar las colas de correo y noticias?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
"Al purgar el paquete se pueden eliminar tanto el correo de Cyrus y las colas "
-"de noticias como los guiones de filtrado de los usuarios"
+"de noticias, como los scripts de filtrado de los usuarios."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
"locations will not be removed; just the old ones in /var."
msgstr ""
-"Esta pregunta es sólo aplicable a los directorios por omisión de colas y de "
-"guiones criba de /var. Si modificó sus ubicaciones en imapd.conf, las nuevas "
-"ubicaciones no se eliminarán; sólo las viejas de /var."
+"Esta pregunta sólo se aplica a los directorios predeterminados de las colas "
+"y de los scripts de filtrado de «/var». Si modificó sus ubicaciones en el "
+"archivo «imapd.conf», las nuevas ubicaciones no se eliminarán; sólo lo harán "
+"las viejas de «/var»."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "¡Los gestores de la base de datos han cambiado!"
Modified: kolab-cyrus-imapd/trunk/debian/po/eu.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/eu.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/eu.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,83 +1,88 @@
# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
-# translation of cyrus-imapd-2.2-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 at beobide.net>, 2008.
+# translation of cyrus-imapd-2.2-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 at beobide.net>, 2008.
msgid ""
msgstr ""
"Project-Id-Version: cyrus-imapd-2.2-eu\n"
"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
-"POT-Creation-Date: 2008-03-31 19:51+0200\n"
-"PO-Revision-Date: 2008-04-02 11:52+0200\n"
-"Last-Translator: Piarres Beobide <pi at beobide.net>\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-05-28 11:56+0200\n"
+"Last-Translator: pi <pi>\n"
"Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
+"Language: eu\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"
+"X-Generator: Pootle 1.2.1\n"
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
-msgid "Database backends have changed!"
-msgstr "Datubase interfazea aldatu egin da!"
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Eraldatutako datu-base interfazeak"
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
"changed."
msgstr ""
"/usr/lib/cyrus/cyrus-db-types.txt eta /usr/lib/cyrus/cyrus-db-types.active "
-"arteko parekatzeak Cyrus IMAPd-en datubase interfazea aldatu dela erakusten "
+"arteko parekatzeak Cyrus IMAPd-en datu-base interfazea aldatu dela erakusten "
"du."
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
"(8) utility."
msgstr ""
-"Honek datubase interfazea aldatu diren datubaseetan formatu berrira "
+"Honek datu-base interfazea aldatu diren datu-baseetan formatu berrira "
"cvt_cyrusdb(8) lanabesa erabiliaz eskuzko bihurketa bat egin behar dela esan "
"nahi du."
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
"databases to the new format."
msgstr ""
-"Mesedez begiratu /usr/share/doc/kolab-cyrus-common/README.Debian.database "
-"argibide gehiagorako. Ez cyrmaster abiarazi datubasea formatu berrira "
+"Mesedez begiratu /usr/share/doc/kolab-cyrus-common/README.Debian. datu-base "
+"argibide gehiagorako. Ez cyrmaster abiarazi datu-basea formatu berrira "
"bihurtu arte."
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:2001
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr "Eposta eta ilara berriak ezabatu?"
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:2001
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
+#| msgid ""
+#| "The Cyrus mail and news spools, as well as the user's sieve scripts can "
+#| "be removed when the package is purged."
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
"Cyrus posta eta ilara berriak, baita erabiltzaileren sieve script-ak ere "
"ezabatu egin daitezke paketea garbitzerakoan."
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:2001
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
@@ -87,3 +92,6 @@
"bakarrik dagokie. Zuk horien kokapena imapd-con fitxategian aldatu baduzu, "
"kokaleku berriaz ez dira ezabatu, /var-en daudenak zaharrak bakarrik "
"ezabatuko dira."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Datubase interfazea aldatu egin da!"
Modified: kolab-cyrus-imapd/trunk/debian/po/fi.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/fi.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/fi.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,10 +1,11 @@
# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
+# Esko Arajärvi <edu at iki.fi>, 2009.
msgid ""
msgstr ""
"Project-Id-Version: cyrus-imapd-2.2\n"
"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
-"POT-Creation-Date: 2008-03-31 19:51+0200\n"
-"PO-Revision-Date: 2008-04-01 20:14+0200\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-29 21:54+0300\n"
"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -12,39 +13,41 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Finnish\n"
"X-Poedit-Country: FINLAND\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
-msgid "Database backends have changed!"
-msgstr "Tietokantojen taustaosat ovat vaihtuneet!"
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Taustatietokantoja on muutettu"
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
"changed."
msgstr ""
"Tiedostojen /usr/lib/cyrus/cyrus-db-types.txt ja /usr/lib/cyrus/cyrus-db-"
-"types.active vertailu osoittaa, että Cyrus IMAPdin tietokantojen taustaosat "
-"on vaihdettu."
+"types.active vertailu osoittaa, että Cyrus IMAPdin taustatietokantoja on "
+"muutettu."
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
"(8) utility."
msgstr ""
-"Tämä tarkoittaa, että tietokannat, joiden taustaosat ovat vaihtuneet, täytyy "
-"ehkä muuntaa käsin uuteen muotoon käyttäen työkalua cvt_cyrusdb(8)."
+"Tämä tarkoittaa, että muuttuneet taustatietokannat täytyy ehkä muuntaa käsin "
+"uuteen muotoon käyttäen työkalua cvt_cyrusdb(8)."
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -54,25 +57,25 @@
"Debian.database. Ohjelmaa cyrmaster ei tule käynnistää ennen kuin "
"tietokannat on muuunnettu uuteen muotoon."
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:2001
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr "Poistetaanko sähköposti- ja uutislaatikot?"
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:2001
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
-"Cyrusin sähköposti-ja uutislaatikot samoin kuin käyttäjien sieve-"
-"komentosarjat voidaan poistaa, kun paketti siivotaan."
+"Cyrusin sähköposti-ja uutislaatikot, samoin kuin käyttäjien sieve-"
+"komentosarjat, voidaan poistaa, kun paketti siivotaan."
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:2001
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
@@ -80,4 +83,5 @@
msgstr ""
"Tämä kysymys koskee vain oletuslaatikoita ja hakemistopuussa /var olevia "
"sieve-komentosarjahakemistoja. Jos näiden sijaintia on muokattu tiedostossa "
-"imapd.conf, uusia ei poisteta, vain vanhat hakemistopuusta /var."
+"imapd.conf, siirrettyjä ei poisteta vaan ainoastaan vanhat hakemistopuusta /"
+"var."
Modified: kolab-cyrus-imapd/trunk/debian/po/fr.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/fr.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/fr.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,89 +1,94 @@
# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
-# PO-DEBCONF TEMPLATE FOR cyrus22-imapd.
-# Copyright (C) 2002 Henrique de Moraes Holschuh <hmh at debian.org>
+# French translation for cyrus22-imapd.
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french at lists.debian.org>
# This file is distributed under the same license as the cyrus22-imapd package.
-# $Id: fr.po 584 2006-08-23 16:41:40Z sven $
#
+# Translators:
+# Philippe Batailler <philippe.batailler at free.fr>, 2009
+#
msgid ""
msgstr ""
"Project-Id-Version: cyrus-imapd-2.2 2.2.13\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
-"PO-Revision-Date: 2006-08-23 10:09+0200\n"
-"Last-Translator: Philippe Batailler <pbatailler at teaser.fr>\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-16 20:31+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler at free.fr>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "Modifications dans l'interfaçage avec les bases de données"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Modifications de l'interface avec les bases de données"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
"changed."
msgstr ""
"Une comparaison entre /usr/lib/cyrus/cyrus-db-types.txt et /usr/lib/cyrus/"
-"cyrus-db-types.active montre que l'interfaçage de Cyrus IMAPd avec les bases "
-"de données a changé."
+"cyrus-db-types.active montre que l'interface entre Cyrus IMAPd et les bases "
+"de données a changé."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
"(8) utility."
msgstr ""
-"Cela signifie que les bases de données pour lesquelles l'interfaçage a "
-"changé peuvent nécessiter une conversion manuelle au nouveau format. Vous "
-"pouvez vous servir de l'utilitaire cvt_cyrusdb (8)."
+"Cela signifie que les bases de données pour lesquelles l'interface a changé "
+"peuvent nécessiter une conversion manuelle au nouveau format avec "
+"l'utilitaire cvt_cyrusdb(8)."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
"databases to the new format."
msgstr ""
-"Veuillez-vous reporter à /usr/share/doc/kolab-cyrus-common/README.Debian."
-"database pour des informations supplémentaires. Ne lancez pas cyrmaster "
-"avant d'avoir converti les bases de données au nouveau format."
+"Veuillez-vous reporter à /usr/share/doc/kolab-cyrus-common/README.Debian."
+"database pour des informations supplémentaires. Ne lancez pas cyrmaster "
+"avant d'avoir converti les bases de données au nouveau format."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr ""
-"Faut-il supprimer les répertoires contenant les courriers et les nouvelles ?"
+"Faut-il supprimer les répertoires contenant les courriers et les nouvelles ?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
-"Les répertoires stockant le courrier et les nouvelles, ainsi que les filtres "
-"des utilisateurs, peuvent être supprimés en même temps que le paquet."
+"Les répertoires stockant le courrier et les nouvelles, ainsi que les filtres "
+"sieve des utilisateurs, peuvent être supprimés en même temps que le paquet."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
"locations will not be removed; just the old ones in /var."
msgstr ""
-"Cette question concerne uniquement les répertoires par défaut situés dans /"
-"var et contenant le « spool » et les filtres. Si vous aviez modifié leurs "
-"emplacements grâce au fichier imapd.conf, ils ne seront pas supprimés ; "
-"seuls les anciens, dans /var, le seront."
+"Cette question concerne uniquement les répertoires par défaut situés dans /"
+"var et contenant le « spool » et les filtres sieve. Si vous aviez modifié "
+"leurs emplacements grâce au fichier imapd.conf, ils ne seront pas "
+"supprimés ; seuls les anciens, dans /var, le seront."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Modifications dans l'interfaçage avec les bases de données"
Modified: kolab-cyrus-imapd/trunk/debian/po/gl.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/gl.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/gl.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,41 +1,44 @@
# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
-# Galician translation of cyrus21-imapd's debconf templates
-# This file is distributed under the same license as the cyrus21-imapd package.
-# Jacobo Tarrio <jtarrio at debian.org>, 2007, 2008.
-#
+# Galician translation of cyrus21-imapd's debconf templates
+# This file is distributed under the same license as the cyrus21-imapd package.
+#
+# Jacobo Tarrio <jtarrio at debian.org>, 2007, 2008.
+# marce villarino <mvillarino at users.sourceforge.net>, 2009.
msgid ""
msgstr ""
"Project-Id-Version: cyrus21-imapd\n"
"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
-"POT-Creation-Date: 2008-03-31 19:51+0200\n"
-"PO-Revision-Date: 2008-04-02 06:39+0100\n"
-"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
-"Language-Team: Galician <proxecto at trasno.net>\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-15 22:42+0200\n"
+"Last-Translator: marce villarino <mvillarino at users.sourceforge.net>\n"
+"Language-Team: Galician <proxecto at trasno.ent>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
-msgid "Database backends have changed!"
-msgstr "Os motores de bases de datos cambiaron"
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Modificáronse as infraestruturas de base de datos"
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
"changed."
msgstr ""
"A comparación entre /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-"
-"db-types.active amosa que os motores de bases de datos de Cyrus IMAPd "
+"db-types.active mostra que os motores de bases de datos de Cyrus IMAPd "
"cambiaron."
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
@@ -45,13 +48,9 @@
"cambiaron se teñan que converter manualmente ao novo formato, empregando a "
"utilidade cvt_cyrusdb(8)."
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:1001
-#| msgid ""
-#| "Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database "
-#| "for more information. Do not start cyrmaster until you have converted "
-#| "the databases to the new format."
+#. Type: error
+#. Description
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -61,34 +60,33 @@
"información. Non inicie cyrmaster ata que teña convertido as bases de datos "
"ao novo formato."
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:2001
-#| msgid "Remove the Cyrus spools, and user sieve scripts?"
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
-msgstr "¿Eliminar os directorios de correo e novas?"
+msgstr "Desexa eliminar os directorios de correo e novas?"
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:2001
-#| msgid ""
-#| "Should I remove the Cyrus mail and news spools, as well as the user's "
-#| "sieve scripts, when the package is purged ?"
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
-"Pódense eliminar os directorios de correo e novas de Cyrus, asà coma os "
+"Pódense eliminar os directorios de correo e novas de Cyrus, asà como os "
"scripts de sieve dos usuarios, ao purgar o paquete."
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:2001
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
"locations will not be removed; just the old ones in /var."
msgstr ""
"Esta pregunta só se aplica aos directorios de traballo e de scripts de sieve "
-"por defecto de /var. Se modificou a súa ubicación en imapd.conf, non se han "
-"eliminar as novas ubicacións; só as antigas de /var."
+"por defecto de /var. Se modificou a súa localización en imapd.conf, non se "
+"han eliminar as novas localizacións; só as antigas de /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Os motores de bases de datos cambiaron"
Modified: kolab-cyrus-imapd/trunk/debian/po/it.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/it.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/it.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,28 +1,28 @@
# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
# Traduzione italiana di cyrus22-imapd
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Cristian Rigamonti <cri at linux.it>, 2004.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# Cristian Rigamonti <cri at linux.it>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
-"PO-Revision-Date: 2006-08-16 11:59+0200\n"
+"Project-Id-Version: cyrus-imapd-2.2 2.2.13-15\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-15 21:13+0200\n"
"Last-Translator: Cristian Rigamonti <cri at linux.it>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "I backend di database sono cambiati!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Backend di database cambiati"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
@@ -31,9 +31,9 @@
"Il confronto tra /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-"
"types.active mostra che i backend di database per Cyrus IMAPd sono cambiati."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
@@ -42,9 +42,9 @@
"Ciò significa che i database per cui sono cambiati i backend devono essere "
"convertiti manualmente al nuovo formato, usando l'utilità cvt_cyrusdb(8)."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -56,15 +56,15 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr "Rimuovere gli spool di Cyrus e gli script sieve degli utenti?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
"Gli spool di posta e news di Cyrus, oltre agli script sieve degli utenti, "
@@ -72,7 +72,7 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
@@ -82,3 +82,6 @@
"degli script sieve in /var. Se la posizione di questi file è stata "
"modificata in imapd.conf, essi non saranno rimossi; saranno rimossi solo i "
"file in /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "I backend di database sono cambiati!"
Modified: kolab-cyrus-imapd/trunk/debian/po/ja.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/ja.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/ja.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -15,25 +15,25 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
-"PO-Revision-Date: 2006-09-13 00:04+0900\n"
-"Last-Translator: Hideki Yamane <henrich at debian.or.jp>\n"
+"Project-Id-Version: cyrus-imapd-2.2 2.2.13-15\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-15 05:25+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®å¤‰æ›´"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
@@ -42,9 +42,9 @@
"/usr/lib/cyrus/cyrus-db-types.txt 㨠/usr/lib/cyrus/cyrus-db-types.active を"
"比較ã—ãŸã¨ã“ã‚ Cyrus IMAPd ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãŒå¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
@@ -53,9 +53,9 @@
"ã“れらã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒå¤‰æ›´ã•ã‚ŒãŸãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã¯ cvt_cyrusdb(8) ユーティリティ"
"を使ã£ã¦æ‰‹å‹•ã§æ–°ã—ã„å½¢å¼ã«å¤‰æ›ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -67,23 +67,23 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr "Cyrus スプールã¨ã€ãƒ¦ãƒ¼ã‚¶ã® sieve スクリプトを削除ã—ã¾ã™ã‹?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
-"Cyrus メール・ニューススプールã¯ã€ãƒ‘ッケージãŒå®Œå…¨ã«å‰Šé™¤ã•ã‚Œã‚‹éš›ã«ãƒ¦ãƒ¼ã‚¶ã® "
-"sieve スクリプトã¨åŒæ§˜ã«å‰Šé™¤ã§ãã¾ã™ã€‚"
+"Cyrus メール・news スプール㯠sieve スクリプトã¨åŒæ§˜ã«ã€ãƒ‘ッケージãŒå®Œå…¨ã«å‰Š"
+"除ã•ã‚Œã‚‹éš›ã«ãƒ¦ãƒ¼ã‚¶ãŒå‰Šé™¤ã§ãã¾ã™ã€‚"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
Modified: kolab-cyrus-imapd/trunk/debian/po/nb.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/nb.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/nb.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -3,29 +3,30 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
-# Bjørn Steensrud <bjornst at skogkatt.homelinux.org>, 2008.
+# Bjørn Steensrud <bjornst at skogkatt.homelinux.org>, 2008, 2009.
msgid ""
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
-"POT-Creation-Date: 2008-03-31 19:51+0200\n"
-"PO-Revision-Date: 2008-04-05 11:27+0200\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-30 02:18+0200\n"
"Last-Translator: Bjørn Steensrud <bjornst at skogkatt.homelinux.org>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\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 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:1001
-msgid "Database backends have changed!"
-msgstr "Databasemotorene i bakgrunnen er endret!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Endrede databasemotorer"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:1001
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
@@ -34,9 +35,9 @@
"Sammenlikning mellom /usr/lib/cyrus/cyrus-db-types.txt og /usr/lib/cyrus/"
"cyrus-db-types.active viser at databasemotorene for Cyrus IMAPd er endret."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:1001
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
@@ -46,9 +47,9 @@
"databasene der bakgrunnsmotorene er endret. Det gjøres med verktøyet "
"cvt_cyrusdb(8)."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:1001
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -60,23 +61,23 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:2001
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr "Skal e-postlager og njuslagre fjernes?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:2001
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
-"E-postlageret og njuslagrene til Cyrus, og også brukerens sieve-skripter, "
+"E-postlageret og njuslagrene til Cyrus, og også brukernes sieve-skripter, "
"kan fjernes når pakka fjernes fullstendig."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:2001
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
@@ -85,3 +86,6 @@
"Dette spørsmålet gjelder bare standard lagre og sieve-skripter i mapper "
"under /var. Hvis de er gitt nye adresser i imapd.conf, så blir ikke de nye "
"stedene ryddet, bare de gamle i /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Databasemotorene i bakgrunnen er endret!"
Modified: kolab-cyrus-imapd/trunk/debian/po/nl.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/nl.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/nl.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -19,8 +19,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cyrus-imapd-2.2 2.2.13-7\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
"PO-Revision-Date: 2006-09-18 20:27+0100\n"
"Last-Translator: Kurt De Bree <kdebree at telenet.be>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -28,15 +28,15 @@
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "Database-backends zijn gewijzigd!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr ""
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
@@ -46,9 +46,9 @@
"cyrus-db-types.active leert ons dat de database-backends voor Cyrus IMAPd "
"gewijzigd zijn."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
@@ -58,9 +58,9 @@
"gewijzigd, mogelijk handmatig moeten worden geconverteerd naar de nieuwe "
"indeling, gebruikmakend van het cvt_cyrusdb(8)-hulpmiddel."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -72,15 +72,19 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr "Mail- en nieuws-spools verwijderen?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
+#, fuzzy
+#| msgid ""
+#| "The Cyrus mail and news spools, as well as the user's sieve scripts can "
+#| "be removed when the package is purged."
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
"De Cyrus mail- en nieuws-spools alsook de gebruikers-sieve-scripts kunnen "
@@ -88,7 +92,7 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
@@ -97,3 +101,6 @@
"Deze vraag heeft enkel betrekking op de standaard spools en de sieve-"
"scriptmappen in /var. Als u deze locatie heeft gewijzigd in imapd.conf, dan "
"zal de nieuwe locatie niet worden verwijderd; enkel de oude in /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Database-backends zijn gewijzigd!"
Modified: kolab-cyrus-imapd/trunk/debian/po/pt.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/pt.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/pt.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,30 +1,30 @@
# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
# Portuguese translation of cyrus-imapd-2.2 debconf messages.
-# Copyright (C) 2007 Carlos Lisboa
+# Copyright (C) 2009 Carlos Lisboa
# This file is distributed under the same license as the cyrus-imapd-2.2 package.
-# Carlos Lisboa <carloslisboa at gmail.com>, 2007.
+# Carlos Lisboa <carloslisboa at gmail.com>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: cyrus-imapd-2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-24 14:47+0000\n"
-"PO-Revision-Date: 2007-08-24 21:32+0100\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-27 21:19+0100\n"
"Last-Translator: Carlos Lisboa <carloslisboa at gmail.com>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:1001
-msgid "Database backends have changed!"
-msgstr "Os 'backends' das bases de dados foram alterados!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Base de dados do 'backend' modificada"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:1001
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
@@ -33,9 +33,9 @@
"Comparando /usr/lib/cyrus/cyrus-db-types.txt e /usr/lib/cyrus/cyrus-db-types."
"active mostra que o 'backend' da base de dados Cyrus IMAPd foi alterado."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:1001
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
@@ -45,9 +45,9 @@
"poderão necessitar de conversão manual para o novo formato, usando o "
"utilitário cvt_cyrusdb(8)."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:1001
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -59,23 +59,23 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:2001
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr "Remover os spools de e-mail e notÃcias (news)?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:2001
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
-"Os spools de e-mail e notÃcias Cyrus, assim como os scripts sieve do "
-"utilizadorpodem ser removidos quando o pacote for purgado."
+"Os spools de e-mail e notÃcias Cyrus, assim como os 'scripts sieve' do "
+"utilizador, podem ser removidos quando o pacote for purgado."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:2001
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
Modified: kolab-cyrus-imapd/trunk/debian/po/pt_BR.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/pt_BR.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/pt_BR.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -2,13 +2,13 @@
# PO-DEBCONF TEMPLATE FOR cyrus22-imapd.
# Copyright (C) 2002 Henrique de Moraes Holschuh <hmh at debian.org>
# This file is distributed under the same license as the cyrus22-imapd package.
-# $Id: pt_BR.po 622 2006-09-19 13:13:20Z sven $
+# $Id: pt_BR.po 779 2009-06-20 14:48:02Z sven $
#
msgid ""
msgstr ""
"Project-Id-Version: cyrus-imapd-2.2 2.1.12-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
"PO-Revision-Date: 2003-03-03 10:45-0300\n"
"Last-Translator: Henrique de Moraes Holschuh <hmh at debian.org>\n"
"Language-Team: pt_BR <pt_BR at li.org>\n"
@@ -16,15 +16,15 @@
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "Mudança de sistema nas bases de dados!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr ""
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
@@ -34,9 +34,9 @@
"types.active levam a crer que o sistema de base de dados do Cyrus IMAPd foi "
"mudado."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
@@ -46,9 +46,9 @@
"migradas para o novo sistema manualmente, através do utilitário cvt_cyrusdb"
"(8)."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -60,15 +60,19 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr "Removo as spools do Cyrus e os scripts sieve?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
+#, fuzzy
+#| msgid ""
+#| "The Cyrus mail and news spools, as well as the user's sieve scripts can "
+#| "be removed when the package is purged."
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
"É possível remover as áreas de armazenagem (spools) usadas pelo Cyrus, e "
@@ -77,7 +81,7 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
@@ -85,3 +89,6 @@
msgstr ""
"Apenas as áreas padrão em /var serão removidas. Caso você tenha configurado "
"outras áreas em imapd.conf, elas não serão removidas."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Mudança de sistema nas bases de dados!"
Modified: kolab-cyrus-imapd/trunk/debian/po/ru.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/ru.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/ru.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,5 +1,5 @@
# AUTOMATICALLY GENERATED -- send updates to cyrus-imapd-2.2 package
-# translation of cyrus-imapd_2.2.13_debconf_ru.po to Russian
+# translation of ru.po to Russian
#
# Translators, if you are not familiar with the PO format, gettext
# documentation is worth reading, especially sections dedicated to
@@ -10,52 +10,57 @@
# /usr/share/doc/po-debconf/README-trans
# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
# Developers do not need to manually edit POT or PO files.
+#
# Yuri Kozlov <kozlov.y at gmail.com>, 2006.
-#
+# Yuri Kozlov <yuray at komyakino.ru>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: cyrus-imapd_2.2.13\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
-"PO-Revision-Date: 2006-08-15 21:36+0300\n"
-"Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
+"Project-Id-Version: cyrus-imapd-2.2 2.2.13-15\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-20 20:08+0400\n"
+"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\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: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "Были изменены backend баз данных!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² поддержке баз данных"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
"changed."
msgstr ""
"Сравнение файлов /usr/lib/cyrus/cyrus-db-types.txt и /usr/lib/cyrus/cyrus-db-"
-"types.active показало, что backend баз данных Ð´Ð»Ñ Cyrus IMAPd были изменены."
+"types.active показало, что интерфейÑÑ‹ баз данных Ð´Ð»Ñ Cyrus IMAPd были "
+"изменены."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
"(8) utility."
msgstr ""
-"Ðто означает, что Ð´Ð»Ñ Ð±Ð°Ð· данных Ñ Ð¸Ð·Ð¼ÐµÐ½Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸ backend может потребоватьÑÑ "
-"ÐºÐ¾Ð½Ð²ÐµÑ€Ñ‚Ð°Ñ†Ð¸Ñ Ð² новый формат вручную Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ утилиты cvt_cyrusdb(8)."
+"Ðто означает, что Ð´Ð»Ñ Ð±Ð°Ð· данных Ñ Ð¸Ð·Ð¼ÐµÐ½Ñ‘Ð½Ð½Ð¾Ð¹ Ñерверной чаÑтью может "
+"потребоватьÑÑ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ в новый формат вручную Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ утилиты "
+"cvt_cyrusdb(8)."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -67,28 +72,28 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr "УдалÑÑ‚ÑŒ буферы почты и новоÑтей?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
"Буферы Cyrus Ð´Ð»Ñ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ и новоÑтей, а также пользовательÑкие фильтрующие "
-"Ñценарии могут удалÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸ вычиÑтке пакета автоматичеÑки."
+"Ñценарии могут удалÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸ вычиÑтке пакета."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
"locations will not be removed; just the old ones in /var."
msgstr ""
"Ðто отноÑитÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ к буферам по умолчанию и каталогам Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€ÑƒÑŽÑ‰Ð¸Ð¼Ð¸ "
-"ÑценариÑми в /var. ЕÑли вы изменили их раÑположение в файле imapd.conf, "
-"новые меÑта удалÑÑ‚ÑŒÑÑ Ð½Ðµ будут -- только Ñтарые в /var."
+"ÑценариÑми в /var. ЕÑли вы изменили их раÑположение в файле imapd.conf, то в "
+"новых меÑтах они удалÑÑ‚ÑŒÑÑ Ð½Ðµ будут -- только Ñтарые в /var."
Modified: kolab-cyrus-imapd/trunk/debian/po/sv.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/sv.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/sv.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -15,81 +15,86 @@
msgid ""
msgstr ""
"Project-Id-Version: cyrus22-imapd\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
-"PO-Revision-Date: 2006-08-15 20:01+0100\n"
-"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
+"PO-Revision-Date: 2009-04-14 20:18+0100\n"
+"Last-Translator: Martin Bagge <brother at bsnet.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "Databasbakänderna har ändrats!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr "Förändrade databasbakdelar"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
"changed."
msgstr ""
-"En jämförelse mellan /usr/lib/cyrus/cyrus-db-types.txt och /usr/lib/cyrus/"
-"cyrus-db-types.active visar att databasbakänderna för Cyrus IMAPd har "
-"ändrats."
+"En jämförelse mellan /usr/lib/cyrus/cyrus-db-types.txt och /usr/lib/cyrus/"
+"cyrus-db-types.active visar att databasbakänderna för Cyrus IMAPd har "
+"ändrats."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
"(8) utility."
msgstr ""
-"Detta betyder att dessa databaser som för vilka databasbakänderna har "
-"ändrats kanske manuellt behöver konverteras till det nya formatet med "
-"verktyget cvt_cyrusdb(8)."
+"Detta innebär att de databaser som databasbakdelarna har ändrats för kanske "
+"manuellt behöver konverteras till det nya formatet med verktyget cvt_cyrusdb"
+"(8)."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
"databases to the new format."
msgstr ""
-"Referera till /usr/share/doc/kolab-cyrus-common/README.Debian.database för "
-"mer information. Starta inte cyrmaster innan du har konverterat databaserna "
-"till det nya formatet."
+"Läs /usr/share/doc/kolab-cyrus-common/README.Debian.database för mer "
+"information. Starta inte cyrmaster innan du har konverterat databaserna till "
+"det nya formatet."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
-msgstr "Ta bort e-post- och nyhetsköfilerna?"
+msgstr "Ta bort köfiler för e-post och nyhetsgrupper?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
-"Cyrus e-post- och nyhetsköfiler, såväl som användarnas sieve-skript kan tas "
-"bort när paketet rensas ut."
+"Cyrus köfiler för e-post och nyhetsgrupper, såväl som användarnas sieve-"
+"skript kan tas bort när paketet rensas ut."
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
"locations will not be removed; just the old ones in /var."
msgstr ""
-"Denna fråga gäller endast för standardköfilerna och sieve-skriptkatalogerna "
-"under /var. Om du har ändrat dess plats i imapd.conf kommer inte de nya "
+"Denna fråga gäller endast för standardköfilerna och sieve-skriptkatalogerna "
+"under /var. Om du har ändrat dess plats i imapd.conf kommer inte de nya "
"platserna att tas bort, endast de gamla under /var."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Databasbakänderna har ändrats!"
Modified: kolab-cyrus-imapd/trunk/debian/po/templates.pot
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/templates.pot 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/templates.pot 2009-10-04 13:00:53 UTC (rev 1355)
@@ -1,22 +1,14 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,33 +16,33 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
msgstr ""
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
"changed."
msgstr ""
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
"(8) utility."
msgstr ""
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -59,21 +51,21 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr ""
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
Modified: kolab-cyrus-imapd/trunk/debian/po/vi.po
===================================================================
--- kolab-cyrus-imapd/trunk/debian/po/vi.po 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/po/vi.po 2009-10-04 13:00:53 UTC (rev 1355)
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cyrus-imapd-2.2.13\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-15 17:54+0200\n"
+"Report-Msgid-Bugs-To: cyrus-imapd-2.2 at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-14 17:58+0200\n"
"PO-Revision-Date: 2006-08-16 18:12+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -17,15 +17,15 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.6fc1\n"
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "Háºu phÆ°Æ¡ng co sở dữ liệu bị thay đổi !"
+#: ../cyrus-common-2.2.templates:2001
+msgid "Modified database backends"
+msgstr ""
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Comparison between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
"cyrus-db-types.active shows that database backends for Cyrus IMAPd have been "
@@ -35,9 +35,9 @@
"db-types.active> chứng minh rằng háºu phÆ°Æ¡ng co sở dữ liệu cho Cyrus IMAPd bị "
"thay đổi."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"This means that those databases for which the database backends changed "
"might need to be converted manually to the new format, using the cvt_cyrusdb"
@@ -47,9 +47,9 @@
"sẽ cần phải tá»± được chuyển đổi sang dạng thức má»›i, dùng tiện Ãch « cvt_cyrusdb"
"(8) »."
-#. Type: note
+#. Type: error
#. Description
-#: ../cyrus-common-2.2.templates:3
+#: ../cyrus-common-2.2.templates:2001
msgid ""
"Please refer to /usr/share/doc/kolab-cyrus-common/README.Debian.database for "
"more information. Do not start cyrmaster until you have converted the "
@@ -61,15 +61,19 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid "Remove the mail and news spools?"
msgstr "Gỡ bỠống chỉ thư và tin tức không?"
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
+#, fuzzy
+#| msgid ""
+#| "The Cyrus mail and news spools, as well as the user's sieve scripts can "
+#| "be removed when the package is purged."
msgid ""
-"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"The Cyrus mail and news spools, as well as users' sieve scripts, can be "
"removed when the package is purged."
msgstr ""
"Những ống chỉ thÆ° và tin tức Cyrus, cÅ©ng nhÆ° những táºp lệnh sieve của ngÆ°á»i "
@@ -77,7 +81,7 @@
#. Type: boolean
#. Description
-#: ../cyrus-common-2.2.templates:19
+#: ../cyrus-common-2.2.templates:3001
msgid ""
"This question only applies to the default spools and sieve script "
"directories in /var. If you modified their location in imapd.conf, the new "
@@ -87,3 +91,6 @@
"nằm trong </var>. Nếu bạn đã sá»a đổi vị trà trong táºp tin cấu hình « imapd."
"conf », những vị trà má»›i sẽ không được gỡ bá»; chỉ những vị trà nằm trong </"
"var> sẽ được gỡ bá»."
+
+#~ msgid "Database backends have changed!"
+#~ msgstr "Háºu phÆ°Æ¡ng co sở dữ liệu bị thay đổi !"
Modified: kolab-cyrus-imapd/trunk/debian/rules
===================================================================
--- kolab-cyrus-imapd/trunk/debian/rules 2009-10-04 12:13:52 UTC (rev 1354)
+++ kolab-cyrus-imapd/trunk/debian/rules 2009-10-04 13:00:53 UTC (rev 1355)
@@ -47,11 +47,11 @@
test -d ${DPATCH_STAMPDIR} || install -d ${DPATCH_STAMPDIR}
@echo "Patches applied in the Debian version of ${DPATCH_PACKAGE}:" > $@T
@echo >> $@T
- dpatch ${_WORKDIR} apply${DPATCH_ALL} ${_STAMPDIR} ${PATCHLIST}
+ dpatch ${_WORKDIR} apply${DPATCH_ALL} -v ${_STAMPDIR} ${PATCHLIST}
dpatch ${_WORKDIR} cat${DPATCH_ALL} ${PATCHLIST} >>$@T
mv -f $@T $@
-unpatch:
+unpatch: clean-patched
dpatch ${_WORKDIR} deapply${DPATCH_ALL} ${_STAMPDIR} ${UNPATCHLIST}
rm -rf ${DPATCH_STAMPFN} ${DPATCH_STAMPFN}T ${DPATCH_STAMPDIR}
@@ -72,6 +72,8 @@
DEBUGFLAGS += -O2
endif
+# TODO: Support parallel builds (make -j x)
+
# FOR AUTOCONF 2.52 AND NEWER ONLY
CONFFLAGS =
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -89,13 +91,13 @@
# configure ; make distclean ; cd intl; make distclean ).
# This is done to make sure the build daemon's source tree is the
# same as the one I am using to produce the i386 debs.
-clean: clean-patched unpatch
+clean: unpatch
clean-patched: configure-stamp
dh_testdir
dh_testroot
-xargs -t -r chmod +x < debian/executable.files
-rm -f build-indep-stamp build-arch-stamp configure-stamp install-arch-stamp install-indep-stamp build-stamp
- -$(MAKE) -i distclean
+ [ ! -f Makefile ] || $(MAKE) -i distclean
-rm -f config.h config.cache config.status config.log stamp-config confdefs.h
-rm -f netnews/Makefile perl/imap/Makefile.old perl/sieve/managesieve/Makefile.old snmp/Makefile Makefile et/Makefile
-rm -f doc/pod2htm*
@@ -112,13 +114,13 @@
build: build-arch build-indep
-configure-stamp: patch
+configure-stamp: ${DPATCH_STAMPFN}
dh_testdir
# -rm -f config.sub config.guess
# cp /usr/share/misc/config.sub config.sub
# cp /usr/share/misc/config.guess config.guess
touch configure.in && touch aclocal.m4 && touch configure
-
+ #
# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
# DBENGINE AT THE TOP OF THIS MAKEFILE!
./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
@@ -159,7 +161,7 @@
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
dh_testdir
-
+ #
PERL_MM_OPT="INSTALLDIRS=vendor" $(MAKE)
# store database configuration for possible automatic
# upgrading later
@@ -172,7 +174,7 @@
mv debian/cyrus-db-types.txt debian/cyrus-db-types.txt.old \
&& sort -u < debian/cyrus-db-types.txt.old > debian/cyrus-db-types.txt \
&& rm debian/cyrus-db-types.txt.old
-
+ #
# store some useful state about the current package
echo "PACKAGE_VERSION $(DEBVERSION)" >debian/cyrus-hardwired-config.txt
if grep -q -s -n -E '^[[:space:]]*#define[[:space:]]+USE_DIR_FULL[[:space:]]+1' config.h ; then \
@@ -180,15 +182,13 @@
else \
echo "USE_DIR_FULL 0" >>debian/cyrus-hardwired-config.txt ;\
fi
-
touch build-arch-stamp
# We aren't actually able to build arch-indep independently from
# arch-dep, so we guarantee that the arch build has been done first
build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp build-arch
+build-indep-stamp: configure-stamp build-arch-stamp
dh_testdir
-
cd doc &&\
pod2man ../perl/sieve/scripts/sieveshell.pl > ../man/sieveshell.1 &&\
fig2dev -L png murder.fig murder.png &&\
@@ -201,17 +201,14 @@
done
pod2html perl/imap/cyradm.sh > doc/man/cyradm.1.html
rm -f pod2htm*
-
touch build-indep-stamp
-install-arch: build-arch
+install-arch: build-arch-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs -a
-
$(MAKE) install DESTDIR=$(TMPPKG)
-
# fix totaly broken location of the include files;
# while at it, also avoid namespace colision, and move
# lots of admin-only/system-only stuff to sbin and lib
@@ -231,48 +228,39 @@
mkdir -p $(TMPPKG)/usr/include
mv $(TMPPKG)/usr/share/include/cyrus $(TMPPKG)/usr/include
#mv $(TMPPKG)/bin/* $(TMPPKG)/usr/bin
-
# Move the perl crap to a saner place
mkdir -p $(TMPPKG)/usr/lib
mkdir -p $(TMPPKG)/usr/share/perl5
#mv $(TMPPKG)/lib/perl5/Cyrus $(TMPPKG)/usr/share/perl5/Cyrus
#mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib
-
# for stuff in /etc
mkdir -p $(TMPPKG)/etc
install -m 644 debian/imapd.conf $(TMPPKG)/etc
install -m 644 debian/cyrus.conf $(TMPPKG)/etc
-
# We rename some utils, so we need to sort out the manpages
for i in master reconstruct quota deliver ; do \
mv $(TMPPKG)/usr/share/man/man8/$$i.8 $(TMPPKG)/usr/share/man/man8/cyr$${i}.8 ; \
done
-
# And add our own manpages
mkdir -p $(TMPPKG)/usr/share/man/man8
install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8
install -m 644 debian/cyrus-makedirs.8 $(TMPPKG)/usr/share/man/man8/cyrus-makedirs.8
install -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8
-
# SNMP files
mkdir -p $(TMPPKG)/usr/share/snmp/mibs
install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt
-
# Install cyradm icons
mkdir -p $(TMPPKG)/usr/share/icons/mini
install -m 644 debian/cyradm-32x32.xpm $(TMPPKG)/usr/share/icons/cyradm.xpm
install -m 644 debian/cyradm-16x16.xpm $(TMPPKG)/usr/share/icons/mini/cyradm.xpm
-
# Install debian-provided scripts
install debian/cyrus-makedirs $(TMPPKG)/usr/sbin/cyrus-makedirs
install -m 644 debian/get-backtrace.gdb $(TMPPKG)/usr/lib/cyrus/get-backtrace.gdb
-
# and logcheck files
install -m 644 debian/logcheck.ignore \
$(PKGDIR)/etc/logcheck/ignore.d.server/logcheck-kolab-cyrus
install -m 644 debian/logcheck.violations.ignore \
$(PKGDIR)/etc/logcheck/violations.ignore.d/logcheck-kolab-cyrus
-
# Install the stuff needed for upgrades
for i in convert-sieve.pl dohash rehash undohash translatesieve \
upgradesieve masssievec; do \
@@ -284,7 +272,6 @@
$(PKGDIR)/usr/lib/cyrus
# And other misc useful tools
install -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort
-
# Install imtest and its symlinks
mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/kolab-cyrus-clients/usr/bin
for i in $(TMPPKG)/usr/bin/*test ; do \
@@ -292,46 +279,40 @@
(cd $(CURDIR)/debian/kolab-cyrus-clients/usr/bin &&\
ln -s imtest `basename $$i`) ;\
done
-
- # Lintian and Linda overrides
+ # Lintian overrides
cd debian ; \
- for i in *.linda ; do \
- mkdir -p "$${i%%.linda}/usr/share/linda/overrides" ;\
- install -m 644 "$$i" "$${i%%.linda}/usr/share/linda/overrides/$${i%%.linda}" ;\
- done ;\
for i in *.lintian ; do \
mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
install -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
done
-
dh_install -a --sourcedir=$(TMPPKG)
touch install-arch-stamp
# We aren't actually able to install arch-indep independently from
# arch-dep, so we guarantee that the arch build has been done first
-install-indep: build-indep install-arch
+install-indep: build-indep-stamp install-arch
dh_testdir
dh_testroot
#dh_clean -k
dh_installdirs -i
-
+ #
# Massage the documentation into place
#mkdir -p $(DOCDIR)
#find doc/text -name '[Ra-z]*' -type f -exec cp -f {} $(PKGDIR)/usr/share/doc/$(MAINPKG) \;
#-(cd $(PKGDIR)/usr/share/doc/$(MAINPKG) && rm copyrights changes htmlstrip.c)
#find $(PKGDIR)/usr/share/doc/$(MAINPKG) -type f ! -name '*txt' ! -name '*.*' -exec mv {} {}.txt \;
-
+ #
# Install the html docs and examples
# mkdir -p $(DOCDIR)/html
# install -m 644 doc/*.html doc/murder.png $(DOCDIR)/html
# cp -a doc/man $(DOCDIR)/html
# cp -a debian/examples $(DOCDIR)
# install -m 644 doc/cyrusv2.mc $(DOCDIR)/examples
-
+ #
# Install contrib/ files
# mkdir -p $(DOCDIR)/contrib
# xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib
-
+ #
dh_install -i --sourcedir=$(TMPPKG)
binary-indep: install-indep
More information about the pkg-kolab-devel
mailing list