[SVN] r595 - in /branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian: ./ patches/ po/

debian at incase.de debian at incase.de
Wed Sep 6 02:50:09 UTC 2006


Author: astronut
Date: Wed Sep  6 04:50:07 2006
New Revision: 595

URL: https://mail.incase.de/viewcvs?rev=595&root=cyrus22&view=rev
Log:
Sync up (mostly) with current branch of 2.2

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

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/README.Debian
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/README.Debian?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/README.Debian (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/README.Debian Wed Sep  6 04:50:07 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/cyrus23/cyrus-imapd-2.3-2.3.7/debian/README.Debian.database
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/README.Debian.database?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/README.Debian.database (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/README.Debian.database Wed Sep  6 04:50:07 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/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog Wed Sep  6 04:50:07 2006
@@ -23,6 +23,35 @@
   * Remove patch files that are no longer used 
 
  -- Benjamin Seidenberg <astronut at dlgeek.net>  Tue,  5 Sep 2006 22:14:43 -0400
+
+cyrus-imapd-2.2 (2.2.13-7) UNRELEASED; 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)
+
+ -- Sven Mueller <sven at debian.org>  Thu, 31 Aug 2006 17:07:26 +0200
 
 cyrus-imapd-2.2 (2.2.13-6) unstable; urgency=low
 

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.templates
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.templates?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.templates (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus-common-2.3.templates Wed Sep  6 04:50:07 2006
@@ -1,7 +1,7 @@
 Template: cyrus-common-2.3/warnbackendchange
 Type: note
 _Description: Database backends have changed!
- Comparation between /usr/lib/cyrus/cyrus-db-types.txt and
+ Comparaison 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.3/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/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus.conf
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus.conf?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus.conf (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/cyrus.conf Wed Sep  6 04:50:07 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

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.ignore Wed Sep  6 04:50:07 2006
@@ -31,6 +31,7 @@
 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
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ cyrus/lmtpunix\[[0-9]+\]: sieve redirected: <[^>]*> to: [._[:alnum:]-]+@[._[:alnum:]-]+$
 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
@@ -52,3 +53,5 @@
 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
+cyrus/lmtpunix\[[0-9]+\]: +WARNING: sieve script [/a-zA-Z^]+/defaultbc doesn't exist: No such file or directory
+cyrus/lmtpunix\[[0-9]+\]: +Delivered: <[^>]*> to mailbox: .*

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.violations.ignore
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.violations.ignore?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.violations.ignore (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/logcheck.violations.ignore Wed Sep  6 04:50:07 2006
@@ -1,4 +1,5 @@
 cyrus/lmtpunix\[[0-9]+\]: +IOERROR: fstating sieve script [/a-zA-Z^]+/defaultbc: No such file or directory
+cyrus/lmtpunix\[[0-9]+\]: +WARNING: sieve script [/a-zA-Z^]+/defaultbc doesn't exist: 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

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/cs.po
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/cs.po?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/cs.po (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/cs.po Wed Sep  6 04:50:07 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/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/cs.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/de.po
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/de.po?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/de.po (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/de.po Wed Sep  6 04:50:07 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/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/de.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/fr.po
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/fr.po?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/fr.po (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/fr.po Wed Sep  6 04:50:07 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/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/fr.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/it.po
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/it.po?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/it.po (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/it.po Wed Sep  6 04:50:07 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/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/it.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/ja.po
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/ja.po?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/ja.po (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/ja.po Wed Sep  6 04:50:07 2006
@@ -16,7 +16,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-01 03:04+0900\n"
 "Last-Translator: Hideki Yamane <henrich at samba.gr.jp>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -34,7 +34,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 ""
@@ -60,22 +60,23 @@
 "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?"
+msgid "Remove the mail and news spools?"
 msgstr "Cyrus ¥¹¥×¡¼¥ë¤È¡¢¥æ¡¼¥¶¤Î 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 ""
 "¥Ñ¥Ã¥±¡¼¥¸¤¬´°Á´¤Ëºï½ü¤µ¤ì¤¿ºÝ¡¢sieve ¥¹¥¯¥ê¥×¥È¤ÈƱÍÍ¤Ë Cyrus ¥á¡¼¥ë¡¦¥Ë¥å¡¼"
 "¥¹¥¹¥×¡¼¥ë¤òºï½ü¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤«?"

Propchange: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/ja.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/nl.po
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/nl.po?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/nl.po (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/nl.po Wed Sep  6 04:50:07 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/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/nl.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/pt_BR.po
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/pt_BR.po?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/pt_BR.po (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/pt_BR.po Wed Sep  6 04:50:07 2006
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the cyrus22-imapd package.
 # $Id: pt_BR.po 247 2005-12-29 16:29:27Z sven $
 #
-#, 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/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/pt_BR.po
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/templates.pot
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/templates.pot?rev=595&root=cyrus22&r1=594&r2=595&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/templates.pot (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/po/templates.pot Wed Sep  6 04:50:07 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 ""



More information about the Pkg-Cyrus-imapd-Debian-devel mailing list