[SVN] r604 - in /branches/sarge-2.2.13/debian: ./ patches/ po/

Wed Sep 13 12:37:11 UTC 2006

Author: sven
Date: Wed Sep 13 14:37:10 2006
New Revision: 604

URL: https://mail.incase.de/viewcvs?rev=604&root=cyrus22&view=rev
Log:
Merge r561:601 from trunk

Added:
    branches/sarge-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
      - copied unchanged from r603, trunk/cyrus-imapd-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
    branches/sarge-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch
      - copied unchanged from r603, trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch
    branches/sarge-2.2.13/debian/po/sv.po
      - copied unchanged from r603, trunk/cyrus-imapd-2.2.13/debian/po/sv.po
Modified:
    branches/sarge-2.2.13/debian/README.Debian
    branches/sarge-2.2.13/debian/README.Debian.database
    branches/sarge-2.2.13/debian/changelog
    branches/sarge-2.2.13/debian/cyrus-common-2.2.templates
    branches/sarge-2.2.13/debian/cyrus.conf
    branches/sarge-2.2.13/debian/imapd.conf
    branches/sarge-2.2.13/debian/logcheck.ignore
    branches/sarge-2.2.13/debian/logcheck.violations.ignore
    branches/sarge-2.2.13/debian/patches/00list
    branches/sarge-2.2.13/debian/patches/23-configurable_idled.dpatch
    branches/sarge-2.2.13/debian/po/cs.po   (contents, props changed)
    branches/sarge-2.2.13/debian/po/de.po   (contents, props changed)
    branches/sarge-2.2.13/debian/po/fr.po   (contents, props changed)
    branches/sarge-2.2.13/debian/po/it.po   (contents, props changed)
    branches/sarge-2.2.13/debian/po/ja.po   (contents, props changed)
    branches/sarge-2.2.13/debian/po/nl.po   (contents, props changed)
    branches/sarge-2.2.13/debian/po/pt_BR.po   (contents, props changed)
    branches/sarge-2.2.13/debian/po/templates.pot

Modified: branches/sarge-2.2.13/debian/README.Debian
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/README.Debian?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================

--- branches/sarge-2.2.13/debian/README.Debian (original)
+++ branches/sarge-2.2.13/debian/README.Debian Wed Sep 13 14:37:10 2006
@@ -45,7 +45,8 @@
 
    Since documentation may refer to these utilities using their original
    name, you must be aware of this fact.  Also, installsieve is deprecated
-   and not included in the Debian package; use sieveshell instead.
+   and will be removed from the Debian package in the future; use sieveshell
+   instead.
 
 2. Relocation of many Cyrus IMAP files
 

Modified: branches/sarge-2.2.13/debian/README.Debian.database
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/README.Debian.database?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/README.Debian.database (original)
+++ branches/sarge-2.2.13/debian/README.Debian.database Wed Sep 13 14:37:10 2006
@@ -67,10 +67,10 @@
    'quotalegacy'.
    
    The SUBS and SEEN databases are different: there are many of them (one
-   for every mail folder of every user for SEEN; one for every user for
-   SUBS) and you need to convert every single one of them.
+   for every user for SEEN and SUBS respectively) and you need to convert
+   every single one of them.
 
-   SUBS			/var/lib/cyrus/...../*.subs
+   SUBS			/var/lib/cyrus/...../*.sub
    SEEN			/var/lib/cyrus/...../*.seen
 
    SUBS contains the subscribed folders, and SEEN contains the seen state

Modified: branches/sarge-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/changelog?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/changelog (original)
+++ branches/sarge-2.2.13/debian/changelog Wed Sep 13 14:37:10 2006
@@ -1,3 +1,42 @@
+cyrus-imapd-2.2 (2.2.13-8) UNRELEASED; urgency=low
+
+  * backport to sarge 
+
+ -- Sven Mueller <sven at debian.org>  Wed, 13 Sep 2006 14:35:54 +0200
+
+cyrus-imapd-2.2 (2.2.13-7) unstable; urgency=low
+
+  * The "Bad translations in the middle of the night" release.
+  * Update czech translation by Martin ÂŠÃn <martin.sin at zshk.cz>
+    (Closes: #382775,#383226)
+  * Add logcheck ignore line for lmtp delivery log entries (Closes: #382942)
+  * Update imapd.conf and cyrus.conf to reflect the configurable IDLE patch
+    applied since 2.2.13-5. (Closes: #382938)
+  * Update a debconf question so that it doesn't ask in first persion. Fixes a
+    lintian warning or even two.
+  * Fix delprune event in cyrus.conf to use cyr_expire (Closes: #383015)
+  * Add swedish translation by Daniel Nylander <po at danielnylander.se>
+  * Fix some mistakes in the german translation, most corrections by Holger
+    Wansing <linux at wansing-online.de>
+  * Update italian translation by Cristian Rigamonti <cri at linux.it>
+  * Correct README.Debian.database regarding number of .seen and .sub
+    databases. (Closes: #383484)
+  * Change wording regarding installsieve in README.Debian. (Closes: #383485)
+  * Add a "WARNING" prefix to the error message about missing sieve scripts.
+    (Closes: #383640)
+  * Add a logcheck ignore clause for sieve redirects. (Closes: #384265)
+  * Fix an implicit pointer conversion in imap/global.c (Closes: #384279)
+  * Update french translation thanks to Philippe Batailler and the
+    debian-l10n-french mailing list. (Closes: #384288)
+  * added 'sieve_allowreferrals' option which controls whether timsieved
+    issues referrals (default) or proxies (by murch at andrew.cmu.edu)
+  * update japanese debconf translation, thanks to Hideki Yamane
+    (henrich at samba.gr.jp)
+  * Update logcheck rules (thanks to Paul Traina <reportbug at st04.pst.org>)
+    (Closes: #387180)
+
+ -- Sven Mueller <sven at debian.org>  Wed, 13 Sep 2006 14:35:41 +0200
+
 cyrus-imapd-2.2 (2.2.13-5bpo2) sarge-backports; urgency=low
 
   * Remove build-dep on libsmnp9 (unstable) for sarge backport due to

Modified: branches/sarge-2.2.13/debian/cyrus-common-2.2.templates
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/cyrus-common-2.2.templates?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/cyrus-common-2.2.templates (original)
+++ branches/sarge-2.2.13/debian/cyrus-common-2.2.templates Wed Sep 13 14:37:10 2006
@@ -1,7 +1,7 @@
 Template: cyrus-common-2.2/warnbackendchange
 Type: note
 _Description: Database backends have changed!
- Comparation between /usr/lib/cyrus/cyrus-db-types.txt and
+ 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.
  .
@@ -16,9 +16,9 @@
 Template: cyrus-common-2.2/removespools
 Type: boolean
 Default: false
-_Description: Remove the Cyrus spools, and user sieve scripts?
- Should I remove the Cyrus mail and news spools, as well as the user's
- sieve scripts, when the package is purged ?
+_Description: Remove the mail and news spools?
+ The Cyrus mail and news spools, as well as the user's sieve scripts
+ can be removed when the package is purged.
  .
  This question only applies to the default spools and sieve script
  directories in /var.  If you modified their location in imapd.conf, the

Modified: branches/sarge-2.2.13/debian/cyrus.conf
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/cyrus.conf?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/cyrus.conf (original)
+++ branches/sarge-2.2.13/debian/cyrus.conf Wed Sep 13 14:37:10 2006
@@ -8,8 +8,7 @@
 	# do not delete this entry!
 	recover		cmd="/usr/sbin/ctl_cyrusdb -r"
   
-	# this is only necessary if using idled for IMAP IDLE
-	# this is NOT to be enabled right now in Debian builds
+	# this is only necessary if idlemethod is set to "idled" in imapd.conf
 	#idled		cmd="idled"
 
 	# this is useful on backend nodes of a Murder cluster
@@ -74,7 +73,7 @@
 	checkpoint	cmd="/usr/sbin/ctl_cyrusdb -c" period=30
 
 	# this is only necessary if using duplicate delivery suppression
-	delprune	cmd="/usr/sbin/ctl_deliver -E 3" at=0401
+	delprune	cmd="/usr/sbin/cyr_expire -E 3" at=0401
 
 	# this is only necessary if caching TLS sessions
 	tlsprune	cmd="/usr/sbin/tls_prune" at=0401

Modified: branches/sarge-2.2.13/debian/imapd.conf
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/imapd.conf?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/imapd.conf (original)
+++ branches/sarge-2.2.13/debian/imapd.conf Wed Sep 13 14:37:10 2006
@@ -298,7 +298,8 @@
 # Options: poll (default), idled, no
 # poll doesn't need the idled daemon and is supposed to be more robust.
 # however it doesn't update as quickly as the idled backend does. "no"
-# turns off IDLE support
+# turns off IDLE support. If set to "idled", you will also need to enable
+# the "idled" entry in cyrus.conf.
 idlemethod: poll
 
 # Unix domain socket that idled listens on.

Modified: branches/sarge-2.2.13/debian/logcheck.ignore
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/logcheck.ignore?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/logcheck.ignore (original)
+++ branches/sarge-2.2.13/debian/logcheck.ignore Wed Sep 13 14:37:10 2006
@@ -1,54 +1,62 @@
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +skiplist: recovered
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +skiplist: checkpointed
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_prune: pruning
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_prune: purged
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +executed
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +accepted connection
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +telling master
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mydelete:
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(bad)?login:
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +starttls: [[:alnum:]]+ with cipher
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed:
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +DIGEST-MD5 server step
-cyrus/ctl_cyrusdb\[[0-9]+\]: +(done +)?recovering cyrus databases
-cyrus/ctl_cyrusdb\[[0-9]+\]: +archiving
-cyrus/ctl_cyrusdb\[[0-9]+\]: +checkpointing
-cyrus/ctl_cyrusdb\[[0-9]+\]: +done checkpointing
-cyrus/ctl_deliver\[[0-9]+\]: +duplicate_prune: pruning back
-cyrus/ctl_deliver\[[0-9]+\]: +duplicate_prune: purged
-cyrus/tls_prune\[[0-9]+\]: +(tls_prune: )?purged
-cyrus/master\[[0-9]+\]: +ready for work
-cyrus/master\[[0-9]+\]: +about to exec
-cyrus/master\[[0-9]+\]: +process started
-cyrus/master\[[0-9]+\]: +process [0-9]+ exited, status 0$
-cyrus/master\[[0-9]+\]: +service [a-zA-Z0-9]+ now has [0-9]+ workers
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +pop3s failed:
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +lmtp connection preauth'd as postman
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +dupelim: eliminated duplicate message to
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_check:
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +duplicate_mark:
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: committing txn
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: starting txn
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +sieve parse error
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +sieve: discarded
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +abort_txn: aborting txn
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +delete: starting txn
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +open: user .* opened
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mycommit: committing txn
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +myfetch: reusing txn
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +myfetch: starting txn
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mystore: reusing txn
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +seen_db: user .* opened
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +Connection reset by peer, closing connection
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT failed
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT returned [0-9]+ messages
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +idle for too long, closing connection
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +annotatemore_store
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +created stage directory
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +imaps TLS negotiation failed
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +synchronizing mailbox
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mailbox list synchronization
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +unready for connections
-cyrus/squatter\[[0-9]+\]: +(done )?(indexing|skipping) mailbox
-cyrus/notifyd\[[0-9]+\]: do_notify using method
-cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: skiplist: recovered
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: skiplist: checkpointed
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_prune: pruning
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_prune: purged
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: executed
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: accepted connection
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: telling master
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +mydelete:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: (bad)?login:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: starttls: [[:alnum:]]+ with cipher
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: (\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: DIGEST-MD5 server step
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: (done +)?recovering cyrus databases
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: archiving
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: checkpointing
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_cyrusdb\[[0-9]+\]: done checkpointing
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_deliver\[[0-9]+\]: duplicate_prune: pruning back
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/ctl_deliver\[[0-9]+\]: duplicate_prune: purged
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/tls_prune\[[0-9]+\]: (tls_prune: )?purged
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: ready for work
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: about to exec
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: process started
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: process [0-9]+ exited, status 0$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/master\[[0-9]+\]: service [a-zA-Z0-9]+ now has [0-9]+ workers
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: pop3s failed:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: lmtp connection preauth'd as postman
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: dupelim: eliminated duplicate message to
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_check:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: duplicate_mark:
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mystore: committing txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mystore: starting txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: sieve parse error
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: sieve: discarded
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: abort_txn: aborting txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: delete: starting txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: open: user .* opened
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mycommit: committing txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: myfetch: reusing txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: myfetch: starting txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mystore: reusing txn
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: seen_db: user .* opened
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: Connection reset by peer, closing connection
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: SQUAT failed
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: SQUAT returned [0-9]+ messages
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: idle for too long, closing connection
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: annotatemore_store
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: created stage directory
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: imaps TLS negotiation failed
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: synchronizing mailbox
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: mailbox list synchronization
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: unready for connections
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/squatter\[[0-9]+\]: (done )?(indexing|skipping) mailbox
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/notifyd\[[0-9]+\]: do_notify using method
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/sieve\[[0-9]+\]: entered bc_action_emit with filelen: [0-9]+$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: no secret in database$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/cyr_expire\[[0-9]+\]: expunged 0 out of 0 messages from 0 mailboxes$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: Expunged [0-9]+ messages from
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: Delivered: <[^>]+> +to mailbox: .*$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ perl: DIGEST-MD5 client step [0-9]$
+

Modified: branches/sarge-2.2.13/debian/logcheck.violations.ignore
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/logcheck.violations.ignore?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/logcheck.violations.ignore (original)
+++ branches/sarge-2.2.13/debian/logcheck.violations.ignore Wed Sep 13 14:37:10 2006
@@ -1,5 +1,6 @@
-cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +(\[[a-z0-9]+\] )?STARTTLS( negotiation)? failed:
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +pop3s failed:
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +SQUAT failed
-cyrus/[a-zA-Z0-9_]+\[[0-9]+\]: +imaps TLS negotiation failed
+
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(lmtp|lmtpunix)\[[0-9]+\]: IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: SQUAT failed to open index file$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?|lmtp|lmtpunix)\[[0-9]+\]: DBERROR db[34]: [0-9]+ lockers$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/(imaps?|pop3s?)\[[0-9]+\]: (START)?TLS( negotiation)? failed:
+

Modified: branches/sarge-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/00list?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/00list (original)
+++ branches/sarge-2.2.13/debian/patches/00list Wed Sep 13 14:37:10 2006
@@ -16,6 +16,7 @@
 0016-upstream-fix-typos.dpatch
 0017-upstream-no-body-empty-string-instead-of-null.dpatch
 0018-upstream-ntohl-instead-of-htonl.dpatch
+0019-upstream-sieve_allowreferrals.dpatch
 0090-fix-casts.dpatch
 01-fix_Makefile.in.dpatch
 02-add_mkinstalldirs.dpatch
@@ -49,4 +50,5 @@
 70-allow-larger-buffers.dpatch
 72-faster-isdigit.dpatch
 75-update-imapd.conf-documentation.dpatch
+77-change-missing-sieve-notice.dpatch
 99-update-autoconf.dpatch

Modified: branches/sarge-2.2.13/debian/patches/23-configurable_idled.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/23-configurable_idled.dpatch?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/23-configurable_idled.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/23-configurable_idled.dpatch Wed Sep 13 14:37:10 2006
@@ -5,9 +5,9 @@
 ## DP: Adds imapd.conf option to select IDLE method at runtime
 
 @DPATCH@
-diff -urNad idled/configure.in /tmp/dpep.DayPV6/idled/configure.in
---- idled/configure.in	2006-05-08 15:26:22.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/configure.in	2006-05-08 15:26:26.585498702 +0200
+diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/configure.in
+--- cyrus-imapd-2.2.13/configure.in	2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/configure.in	2006-08-23 18:13:56.178920138 +0200
 @@ -760,9 +760,6 @@
                            METHOD is [poll], idled or no],
  	WITH_IDLE="${withval}",WITH_IDLE="poll")
@@ -18,9 +18,9 @@
  
  dnl
  dnl see if we're compiling with NNTP support
-diff -urNad idled/imap/Makefile.in /tmp/dpep.DayPV6/idled/imap/Makefile.in
---- idled/imap/Makefile.in	2006-05-08 15:26:22.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/imap/Makefile.in	2006-05-08 15:26:26.585498702 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/Makefile.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/Makefile.in
+--- cyrus-imapd-2.2.13/imap/Makefile.in	2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/Makefile.in	2006-08-23 18:13:56.178920138 +0200
 @@ -47,9 +47,6 @@
  # 'local' (legacy flat file).
  SEEN=seen_db.o
@@ -50,10 +50,18 @@
  	fud smmapd reconstruct quota mbpath ipurge \
  	cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
  	ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
-diff -urNad idled/imap/global.c /tmp/dpep.DayPV6/idled/imap/global.c
---- idled/imap/global.c	2006-05-08 15:26:22.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/imap/global.c	2006-05-08 15:26:26.586498608 +0200
-@@ -94,6 +94,8 @@
+diff -urNad cyrus-imapd-2.2.13/imap/global.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.c
+--- cyrus-imapd-2.2.13/imap/global.c	2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.c	2006-08-23 18:28:28.243411698 +0200
+@@ -72,6 +72,7 @@
+ #include "prot.h" /* for PROT_BUFSIZE */
+ #include "util.h"
+ #include "xmalloc.h"
++#include "idle.h"
+ 
+ static enum {
+     NOT_RUNNING = 0,
+@@ -94,6 +95,8 @@
  /* syslog prefix tag */
  static char syslog_prefix[20];
  
@@ -62,7 +70,7 @@
  /* Called before a cyrus application starts (but after command line parameters
   * are read) */
  int cyrus_init(const char *alt_config, const char *ident, unsigned flags)
-@@ -185,6 +187,10 @@
+@@ -185,6 +188,10 @@
  	config_ptscache_db =
  	    cyrusdb_fromname(config_getstring(IMAPOPT_PTSCACHE_DB));
  
@@ -73,9 +81,9 @@
  	/* configure libcyrus as needed */
  	libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, config_dir);
  	libcyrus_config_setswitch(CYRUSOPT_AUTH_UNIX_GROUP_ENABLE,
-diff -urNad idled/imap/global.h /tmp/dpep.DayPV6/idled/imap/global.h
---- idled/imap/global.h	2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/imap/global.h	2006-05-08 15:26:26.586498608 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/global.h /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.h
+--- cyrus-imapd-2.2.13/imap/global.h	2006-08-21 23:32:39.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.h	2006-08-23 18:13:56.179920040 +0200
 @@ -152,4 +152,6 @@
  extern struct cyrusdb_backend *config_tlscache_db;
  extern struct cyrusdb_backend *config_ptscache_db;
@@ -83,9 +91,9 @@
 +extern struct idle_backend *config_idle;
 +
  #endif /* INCLUDED_GLOBAL_H */
-diff -urNad idled/imap/idle.c /tmp/dpep.DayPV6/idled/imap/idle.c
---- idled/imap/idle.c	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.DayPV6/idled/imap/idle.c	2006-05-08 15:26:26.587498514 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/idle.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.c
+--- cyrus-imapd-2.2.13/imap/idle.c	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.c	2006-08-23 18:13:56.179920040 +0200
 @@ -0,0 +1,87 @@
 +/* 
 + * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
@@ -174,9 +182,9 @@
 +
 +    return idle;
 +}
-diff -urNad idled/imap/idle.h /tmp/dpep.DayPV6/idled/imap/idle.h
---- idled/imap/idle.h	2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/imap/idle.h	2006-05-08 15:26:26.587498514 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/idle.h /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.h
+--- cyrus-imapd-2.2.13/imap/idle.h	2006-08-21 23:32:39.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.h	2006-08-23 18:13:56.180919942 +0200
 @@ -44,8 +44,7 @@
  #define IDLE_H
  
@@ -242,9 +250,9 @@
 +struct idle_backend *idle_fromname(const char *name);
  
  #endif
-diff -urNad idled/imap/idle_idled.c /tmp/dpep.DayPV6/idled/imap/idle_idled.c
---- idled/imap/idle_idled.c	2006-05-08 15:26:22.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/imap/idle_idled.c	2006-05-08 15:29:34.198879922 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/idle_idled.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_idled.c
+--- cyrus-imapd-2.2.13/imap/idle_idled.c	2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_idled.c	2006-08-23 18:13:56.180919942 +0200
 @@ -58,8 +58,6 @@
  #include "idled.h"
  #include "global.h"
@@ -342,9 +350,9 @@
 +    &idle_idled_start,
 +    &idle_idled_done
 +};
-diff -urNad idled/imap/idle_no.c /tmp/dpep.DayPV6/idled/imap/idle_no.c
---- idled/imap/idle_no.c	2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/imap/idle_no.c	2006-05-08 15:26:26.588498420 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/idle_no.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_no.c
+--- cyrus-imapd-2.2.13/imap/idle_no.c	2006-08-21 23:32:39.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_no.c	2006-08-23 18:13:56.181919844 +0200
 @@ -42,23 +42,31 @@
  
  #include "idle.h"
@@ -384,9 +392,9 @@
 +    &idle_no_start,
 +    &idle_no_done
 +};
-diff -urNad idled/imap/idle_poll.c /tmp/dpep.DayPV6/idled/imap/idle_poll.c
---- idled/imap/idle_poll.c	2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/imap/idle_poll.c	2006-05-08 15:29:45.508817799 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/idle_poll.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_poll.c
+--- cyrus-imapd-2.2.13/imap/idle_poll.c	2006-08-21 23:32:39.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_poll.c	2006-08-23 18:13:56.181919844 +0200
 @@ -51,15 +51,13 @@
  #include "idle.h"
  #include "global.h"
@@ -453,9 +461,9 @@
 +    &idle_poll_start,
 +    &idle_poll_done
 +};
-diff -urNad idled/imap/version.c /tmp/dpep.DayPV6/idled/imap/version.c
---- idled/imap/version.c	2006-04-23 22:39:20.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/imap/version.c	2006-05-08 15:26:26.588498420 +0200
+diff -urNad cyrus-imapd-2.2.13/imap/version.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/version.c
+--- cyrus-imapd-2.2.13/imap/version.c	2006-08-21 23:32:39.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/version.c	2006-08-23 18:13:56.181919844 +0200
 @@ -62,6 +62,7 @@
  #include "map.h"
  #include "lock.h"
@@ -464,9 +472,9 @@
  #include "idle.h"
  
  #ifdef USE_SIEVE
-diff -urNad idled/lib/Makefile.in /tmp/dpep.DayPV6/idled/lib/Makefile.in
---- idled/lib/Makefile.in	2006-05-08 15:26:22.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/lib/Makefile.in	2006-05-08 15:26:26.589498326 +0200
+diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/Makefile.in
+--- cyrus-imapd-2.2.13/lib/Makefile.in	2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/Makefile.in	2006-08-23 18:13:56.182919747 +0200
 @@ -74,6 +74,8 @@
  
  libdir = @libdir@
@@ -485,9 +493,9 @@
  
  imapopts.h: imapopts.c
  
-diff -urNad idled/lib/imapoptions /tmp/dpep.DayPV6/idled/lib/imapoptions
---- idled/lib/imapoptions	2006-05-08 15:26:22.000000000 +0200
-+++ /tmp/dpep.DayPV6/idled/lib/imapoptions	2006-05-08 15:26:26.589498326 +0200
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions	2006-08-23 18:13:47.000000000 +0200
++++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/imapoptions	2006-08-23 18:13:56.182919747 +0200
 @@ -248,6 +248,9 @@
  /* The password to use for authentication to the backend server hostname
     (where hostname is the short hostname of the server) - Cyrus Murder */

Modified: branches/sarge-2.2.13/debian/po/cs.po
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/po/cs.po?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/po/cs.po (original)
+++ branches/sarge-2.2.13/debian/po/cs.po Wed Sep 13 14:37:10 2006
@@ -1,81 +1,81 @@
-# Czech translation of cyrus-imapd-2.2 templates
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: cyrus-imapd-2.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-10 09:48-0700\n"
-"PO-Revision-Date: 2005-12-29 16:07+0100\n"
-"Last-Translator: Martin Sin <martin.sin at seznam.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
-#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid "Database backends have changed!"
-msgstr "Backendy databÃ¡ze se zmÄ›nily!"
-
-#. Type: note
-#. Description
-#: ../cyrus-common-2.2.templates:3
-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 ""
-"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
-#. Description
-#: ../cyrus-common-2.2.templates:3
-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 ""
-"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
-#. Description
-#: ../cyrus-common-2.2.templates:3
-msgid ""
-"Please refer to /usr/share/doc/cyrus21-common/README.Debian.database for "
-"more information.  Do not start cyrmaster until you have converted the "
-"databases to the new format."
-msgstr ""
-"Pro vÃce informacÃ se prosÃm podÃvejte do /usr/share/doc/cyrus21-common/"
-"README.Debian.database. NespouÅ¡tÄ›jte cyrmaster, dokud nepÅ™evedete databÃ¡ze "
-"do novÃ©ho formÃ¡tu."
-
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:19
-msgid "Remove the Cyrus spools, and user sieve scripts?"
-msgstr "Odstranit spool adresÃ¡Å™e Cyrusu a uÅ¾ivatelskÃ© Sieve skripty?"
-
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:19
-msgid ""
-"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
-"scripts, when the package is purged ?"
-msgstr ""
-"MÃ¡m pÅ™i odstranÄ›nÃ balÃÄku smazat spool adresÃ¡Å™ s poÅ¡tou, news pÅ™ÃspÄ›vky a "
-"takÃ© uÅ¾ivatelskÃ© filtrovacÃ skripty v jazyce Sieve?"
-
-#. Type: boolean
-#. Description
-#: ../cyrus-common-2.2.templates:19
-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 ""
-"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."
+# Czech translation of cyrus-imapd-2.2 templates
+# 
+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"
+"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
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid "Database backends have changed!"
+msgstr "Backendy databÃ¡ze se zmÄ›nily!"
+
+#. Type: note
+#. Description
+#: ../cyrus-common-2.2.templates:3
+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 ""
+"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
+#. Description
+#: ../cyrus-common-2.2.templates:3
+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 ""
+"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
+#. Description
+#: ../cyrus-common-2.2.templates:3
+msgid ""
+"Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database for "
+"more information.  Do not start cyrmaster until you have converted the "
+"databases to the new format."
+msgstr ""
+"Pro vÃce informacÃ se prosÃm podÃvejte do /usr/share/doc/cyrus-common-2.2/"
+"README.Debian.database. NespouÅ¡tÄ›jte cyrmaster, dokud nepÅ™evedete databÃ¡ze "
+"do novÃ©ho formÃ¡tu."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+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
+msgid ""
+"The Cyrus mail and news spools, as well as the user's 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 "
+"pÅ™ÃspÄ›vky a takÃ© uÅ¾ivatelskÃ© filtrovacÃ skripty v jazyce Sieve."
+
+#. Type: boolean
+#. Description
+#: ../cyrus-common-2.2.templates:19
+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 ""
+"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."

Propchange: branches/sarge-2.2.13/debian/po/cs.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/sarge-2.2.13/debian/po/de.po
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/po/de.po?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/po/de.po (original)
+++ branches/sarge-2.2.13/debian/po/de.po Wed Sep 13 14:37:10 2006
@@ -16,9 +16,9 @@
 msgstr ""
 "Project-Id-Version: cyrus-imapd-2.2_2.2.12-1_de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"POT-Creation-Date: 2006-08-15 17:54+0200\n"
 "PO-Revision-Date: 2004-05-29 22:44+0200\n"
-"Last-Translator: Erik Schanze <mail at erikschanze.de>\n"
+"Last-Translator: Sven Mueller <sven 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"
@@ -29,19 +29,19 @@
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid "Database backends have changed!"
-msgstr "Datenbankanbindung hat sich geÃ¤ndert!"
+msgstr "Datenbankanbindungen haben sich geÃ¤ndert!"
 
 #. Type: note
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid ""
-"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"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 ""
-"Wenn Sie die Dateien /usr/lib/cyrus/cyrus-db-types.txt und /usr/lib/cyrus/"
-"cyrus-db-types.active vergleichen, sehen Sie, dass die Datenbankanbindung "
-"des Cyrus IMAPd geÃ¤ndert wurde."
+"Ein Vergleich der Dateien /usr/lib/cyrus/cyrus-db-types.txt und /usr/lib/"
+"cyrus/cyrus-db-types.active zeigt, dass die Datenbankanbindungen des Cyrus "
+"IMAPd geÃ¤ndert wurden."
 
 #. Type: note
 #. Description
@@ -51,8 +51,9 @@
 "might need to be converted manually to the new format, using the cvt_cyrusdb"
 "(8) utility."
 msgstr ""
-"Die Datenbanken, fÃ¼r die sich die Anbindung geÃ¤ndert hat, mÃ¼ssenmit dem "
-"Hilfsprogramm cvt_cyrusdb(8) manuell in das neue Format Ã¼berfÃ¼hrt werden."
+"Die Datenbanken, fÃ¼r die sich die Anbindung geÃ¤ndert hat, mÃ¼ssen mit dem "
+"Hilfsprogramm cvt_cyrusdb(8) gegebenenfalls manuell in das neue Format "
+"Ã¼berfÃ¼hrt werden."
 
 #. Type: note
 #. Description
@@ -69,18 +70,19 @@
 #. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
-msgid "Remove the Cyrus spools, and user sieve scripts?"
-msgstr "Cyrus-Spool und Filterskripte der Benutzer lÃ¶schen?"
+msgid "Remove the mail and news spools?"
+msgstr "Mail- und News-Spools entfernen?"
 
 #. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
 msgid ""
-"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
-"scripts, when the package is purged ?"
+"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"removed when the package is purged."
 msgstr ""
-"Sollen die Cyrus Email- bzw. News-Spools und die Filterskripte der Benutzer "
-"gelÃ¶scht werden, wenn das Paket restlos entfernt wird (purge)?"
+"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)."
 
 #. Type: boolean
 #. Description
@@ -92,4 +94,4 @@
 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 die alten im Verzeichnis /var."
+"sie an der neuen Stelle nicht gelÃ¶scht, nur an der Alten im Verzeichnis /var."

Propchange: branches/sarge-2.2.13/debian/po/de.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/sarge-2.2.13/debian/po/fr.po
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/po/fr.po?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/po/fr.po (original)
+++ branches/sarge-2.2.13/debian/po/fr.po Wed Sep 13 14:37:10 2006
@@ -5,24 +5,27 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
-"POT-Creation-Date: 2003-03-03 10:24-0300\n"
-"PO-Revision-Date: 2002-10-22 10:33+0200\n"
+"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"
 "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-Transfer-Encoding: 8bit\n"
 
+#. Type: note
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid "Database backends have changed!"
-msgstr "L'interfaçage avec les bases de données a changé !"
+msgstr "Modifications dans l'interfaçage avec les bases de données"
 
+#. Type: note
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid ""
-"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"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 ""
@@ -30,6 +33,7 @@
 "cyrus-db-types.active montre que l'interfaçage de Cyrus IMAPd avec les bases "
 "de données a changé."
 
+#. Type: note
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid ""
@@ -38,9 +42,10 @@
 "(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. On peut "
-"se servir de l'utilitaire cvt_cyrusdb (8)."
+"changé peuvent nécessiter une conversion manuelle au nouveau format. Vous "
+"pouvez vous servir de l'utilitaire cvt_cyrusdb (8)."
 
+#. Type: note
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid ""
@@ -48,27 +53,28 @@
 "more information.  Do not start cyrmaster until you have converted the "
 "databases to the new format."
 msgstr ""
-"Veuillez-vous reporter à /usr/share/doc/cyrus-common-2.2/README.Debian.database pour "
-"des informations supplémentaires. Ne lancez pas cyrmaster avant d'avoir mis "
-"les bases de données au nouveau format."
+"Veuillez-vous reporter à /usr/share/doc/cyrus-common-2.2/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
-msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgid "Remove the mail and news spools?"
 msgstr ""
-"Faut-il supprimer les répertoires de spool propres à Cyrus, ainsi que les "
-"filtres des utilisateurs ?"
+"Faut-il supprimer les répertoires contenant les courriers et les nouvelles ?"
 
+#. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
 msgid ""
-"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
-"scripts, when the package is purged ?"
+"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"removed when the package is purged."
 msgstr ""
-"Dois-je supprimer les répertoires de spool pour le courrier et les "
-"nouvelles, ainsi que les filtres des utilisateurs, quand le système est "
-"purgé du paquet ?"
+"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."
 
+#. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
 msgid ""
@@ -77,6 +83,6 @@
 "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, ces emplacements ne seront pas "
-"supprimés ; seuls les anciens, dans /var, le seront."
+"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."

Propchange: branches/sarge-2.2.13/debian/po/fr.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/sarge-2.2.13/debian/po/it.po
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/po/it.po?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/po/it.po (original)
+++ branches/sarge-2.2.13/debian/po/it.po Wed Sep 13 14:37:10 2006
@@ -5,8 +5,8 @@
 msgstr ""
 "Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-20 00:16+0200\n"
-"PO-Revision-Date: 2004-03-28 20:17+0200\n"
+"POT-Creation-Date: 2006-08-15 17:54+0200\n"
+"PO-Revision-Date: 2006-08-16 11:59+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"
@@ -17,13 +17,13 @@
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid "Database backends have changed!"
-msgstr "I backend del database sono cambiati!"
+msgstr "I backend di database sono cambiati!"
 
 #. Type: note
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid ""
-"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"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 ""
@@ -56,18 +56,18 @@
 #. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
-msgid "Remove the Cyrus spools, and user sieve scripts?"
+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
 msgid ""
-"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
-"scripts, when the package is purged ?"
+"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"removed when the package is purged."
 msgstr ""
-"Si desidera rimuovere gli spool di posta e news di Cyrus, oltre agli script "
-"sieve degli utenti, quando il pacchetto sarà rimosso?"
+"Gli spool di posta e news di Cyrus, oltre agli script sieve degli utenti, "
+"possono essere rimossi quando il pacchetto sarà rimosso."
 
 #. Type: boolean
 #. Description
@@ -78,5 +78,6 @@
 "locations will not be removed; just the old ones in /var."
 msgstr ""
 "Questa domanda si riferisce solo agli spool predefiniti e alle directory "
-"degli script sieve in /var.  Se la loro posizione è stata modificata in "
-"imapd.conf, non saranno rimosse le nuove posizioni, ma solo quelle in /var."
+"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."

Propchange: branches/sarge-2.2.13/debian/po/it.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/sarge-2.2.13/debian/po/ja.po
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/po/ja.po?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/po/ja.po (original)
+++ branches/sarge-2.2.13/debian/po/ja.po Wed Sep 13 14:37:10 2006
@@ -16,30 +16,30 @@
 msgstr ""
 "Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-20 00:16+0200\n"
-"PO-Revision-Date: 2004-03-01 03:04+0900\n"
-"Last-Translator: Hideki Yamane <henrich at samba.gr.jp>\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"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: note
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid "Database backends have changed!"
-msgstr "¥Ð¥Ã¥¯¥¨¥ó¥É¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬ÊÑ¹¹¤µ¤ì¤Þ¤·¤¿!"
+msgstr "ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ!"
 
 #. Type: note
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid ""
-"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"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 ¤ò"
-"Èæ³Ó¤·¤¿¤È¤³¤í Cyrus IMAPd ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬ÊÑ¹¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
+"/usr/lib/cyrus/cyrus-db-types.txt ã¨ /usr/lib/cyrus/cyrus-db-types.active ã‚’"
+"æ¯”è¼ƒã—ãŸã¨ã“ã‚ Cyrus IMAPd ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãŒå¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚"
 
 #. Type: note
 #. Description
@@ -49,8 +49,8 @@
 "might need to be converted manually to the new format, using the cvt_cyrusdb"
 "(8) utility."
 msgstr ""
-"¤³¤ì¤é¤Î¥Ð¥Ã¥¯¥¨¥ó¥É¤¬ÊÑ¹¹¤µ¤ì¤¿¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï cvt_cyrusdb(8) ¥æ¡¼¥Æ¥£¥ê¥Æ¥£"
-"¤ò»È¤Ã¤Æ¼êÆ°¤Ç¿·¤·¤¤·Á¼°¤ËÊÑ´¹¤¹¤ëÉ¬Í×¤¬¤¢¤ê¤Þ¤¹¡£"
+"ã“ã‚Œã‚‰ã®ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒå¤‰æ›´ã•ã‚ŒãŸãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã¯ cvt_cyrusdb(8) ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£"
+"ã‚’ä½¿ã£ã¦æ‰‹å‹•ã§æ–°ã—ã„å½¢å¼ã«å¤‰æ›ã™ã‚‹å¿
è¦ãŒã‚ã‚Šã¾ã™ã€‚"
 
 #. Type: note
 #. Description
@@ -60,25 +60,25 @@
 "more information.  Do not start cyrmaster until you have converted the "
 "databases to the new format."
 msgstr ""
-"¤è¤ê¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï /usr/share/doc/cyrus-common-2.2/README.Debian.database ¤ò»²"
-"¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤·Á¼°¤ËÊÑ´¹¤¹¤ë¤Þ¤Ç cyrmaster ¤òµ¯Æ°¤·¤Ê¤¤"
-"¤Ç¤¯¤À¤µ¤¤¡£"
+"ã‚ˆã‚Šè©³ç´°ã«ã¤ã„ã¦ã¯ /usr/share/doc/cyrus-common-2.2/README.Debian.database ã‚’"
+"å‚ç
§ã—ã¦ãã ã•ã„ã€‚ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’æ–°ã—ã„å½¢å¼ã«å¤‰æ›ã™ã‚‹ã¾ã§ cyrmaster ã‚’èµ·å‹•ã—ãª"
+"ã„ã§ãã ã•ã„ã€‚"
 
 #. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
-msgid "Remove the Cyrus spools, and user sieve scripts?"
-msgstr "Cyrus ¥¹¥×¡¼¥ë¤È¡¢¥æ¡¼¥¶¤Î sieve ¥¹¥¯¥ê¥×¥È¤òºï½ü¤·¤Þ¤¹¤«?"
+msgid "Remove the mail and news spools?"
+msgstr "Cyrus ã‚¹ãƒ—ãƒ¼ãƒ«ã¨ã€ãƒ¦ãƒ¼ã‚¶ã® sieve ã‚¹ã‚¯ãƒªãƒ—ãƒˆã‚’å‰Šé™¤ã—ã¾ã™ã‹?"
 
 #. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
 msgid ""
-"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
-"scripts, when the package is purged ?"
+"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"removed when the package is purged."
 msgstr ""
-"¥Ñ¥Ã¥±¡¼¥¸¤¬´°Á´¤Ëºï½ü¤µ¤ì¤¿ºÝ¡¢sieve ¥¹¥¯¥ê¥×¥È¤ÈÆ±ÍÍ¤Ë Cyrus ¥á¡¼¥ë¡¦¥Ë¥å¡¼"
-"¥¹¥¹¥×¡¼¥ë¤òºï½ü¤¹¤ëÉ¬Í×¤¬¤¢¤ê¤Þ¤¹¤«?"
+"Cyrus ãƒ¡ãƒ¼ãƒ«ãƒ»ãƒ‹ãƒ¥ãƒ¼ã‚¹ã‚¹ãƒ—ãƒ¼ãƒ«ã¯ã€ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ãŒå®Œå
¨ã«å‰Šé™¤ã•ã‚Œã‚‹éš›ã«ãƒ¦ãƒ¼ã‚¶ã® "
+"sieve ã‚¹ã‚¯ãƒªãƒ—ãƒˆã¨åŒæ§˜ã«å‰Šé™¤ã§ãã¾ã™ã€‚"
 
 #. Type: boolean
 #. Description
@@ -88,6 +88,6 @@
 "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 ¤Ë¤¢¤ëÉ¸½à¤Î¥¹¥×¡¼¥ë¤È sieve ¥¹¥¯¥ê¥×¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Î¤ßÅ¬ÍÑ"
-"¤µ¤ì¤Þ¤¹¡£imapd.conf ¤Ç¥Ç¥£¥ì¥¯¥È¥ê¤òÊÑ¹¹¤·¤Æ¤¤¤ë¾ì¹ç¡¢ÊÑ¹¹¸å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë"
-"¤¢¤ë¤â¤Î¤Ïºï½ü¤µ¤ì¤Þ¤»¤ó¡£/var ¤Ë¤¢¤ë¸Å¤¤¤â¤Î¤À¤±¤Ç¤¹¡£"
+"ã“ã®è³ªå•ã¯ /var ã«ã‚ã‚‹æ¨™æº–ã®ã‚¹ãƒ—ãƒ¼ãƒ«ã¨ sieve ã‚¹ã‚¯ãƒªãƒ—ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã®ã¿é©ç”¨"
+"ã•ã‚Œã¾ã™ã€‚imapd.conf ã§ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’å¤‰æ›´ã—ã¦ã„ã‚‹å ´åˆã€å¤‰æ›´å¾Œã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«"
+"ã‚ã‚‹ã‚‚ã®ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“ã€‚/var ã«ã‚ã‚‹å¤ã„ã‚‚ã®ã ã‘ã§ã™ã€‚"

Propchange: branches/sarge-2.2.13/debian/po/ja.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/sarge-2.2.13/debian/po/nl.po
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/po/nl.po?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/po/nl.po (original)
+++ branches/sarge-2.2.13/debian/po/nl.po Wed Sep 13 14:37:10 2006
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: cyrus-imapd-2.2 2.2.12-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"POT-Creation-Date: 2006-08-15 17:54+0200\n"
 "PO-Revision-Date: 2004-03-29 10:57+0100\n"
 "Last-Translator: Luk Claes <luk.claes at ugent.be>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -33,7 +33,7 @@
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid ""
-"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"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 ""
@@ -68,15 +68,16 @@
 #. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
-msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgid "Remove the mail and news spools?"
 msgstr "De Cyrus-spools, en gebruikers-sieve-scripts verwijderen?"
 
 #. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
+#, fuzzy
 msgid ""
-"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
-"scripts, when the package is purged ?"
+"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"removed when the package is purged."
 msgstr ""
 "Moeten de Cyrus-mail- en -nieuws-spools verwijderd worden, alsook de "
 "gebruikers-sieve-scripts, wanneer het pakket wordt gewist (purged)?"

Propchange: branches/sarge-2.2.13/debian/po/nl.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/sarge-2.2.13/debian/po/pt_BR.po
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/po/pt_BR.po?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/po/pt_BR.po (original)
+++ branches/sarge-2.2.13/debian/po/pt_BR.po Wed Sep 13 14:37:10 2006
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the cyrus22-imapd package.
 # $Id$
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: cyrus-imapd-2.2 2.1.12-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-20 00:16+0200\n"
+"POT-Creation-Date: 2006-08-15 17:54+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"
@@ -26,7 +25,7 @@
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid ""
-"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"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 ""
@@ -61,15 +60,16 @@
 #. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
-msgid "Remove the Cyrus spools, and user sieve scripts?"
+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
+#, fuzzy
 msgid ""
-"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
-"scripts, when the package is purged ?"
+"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"removed when the package is purged."
 msgstr ""
 "Devo remover as áreas de armazenagem (spools) usadas pelo Cyrus, assim como "
 "as áreas usadas para armazenar os scripts sieve dos usuários quando o pacote "

Propchange: branches/sarge-2.2.13/debian/po/pt_BR.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/sarge-2.2.13/debian/po/templates.pot
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/po/templates.pot?rev=604&root=cyrus22&r1=603&r2=604&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/po/templates.pot (original)
+++ branches/sarge-2.2.13/debian/po/templates.pot Wed Sep 13 14:37:10 2006
@@ -15,7 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-03-03 10:24-0300\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: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -23,19 +24,22 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid "Database backends have changed!"
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid ""
-"Comparation between /usr/lib/cyrus/cyrus-db-types.txt and /usr/lib/cyrus/"
+"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
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid ""
@@ -44,6 +48,7 @@
 "(8) utility."
 msgstr ""
 
+#. Type: note
 #. Description
 #: ../cyrus-common-2.2.templates:3
 msgid ""
@@ -52,18 +57,21 @@
 "databases to the new format."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
-msgid "Remove the Cyrus spools, and user sieve scripts?"
+msgid "Remove the mail and news spools?"
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
 msgid ""
-"Should I remove the Cyrus mail and news spools, as well as the user's sieve "
-"scripts, when the package is purged ?"
+"The Cyrus mail and news spools, as well as the user's sieve scripts can be "
+"removed when the package is purged."
 msgstr ""
 
+#. Type: boolean
 #. Description
 #: ../cyrus-common-2.2.templates:19
 msgid ""


