aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2006-11-27 02:59:56 +0000
committerMatthias Andree <matthias.andree@gmx.de>2006-11-27 02:59:56 +0000
commite3b44efa0c4af3b01a7c2156671807d44d180f1b (patch)
tree331cc5f27a2c9ec9a51f312483c694f17ab85d77
parentbb48594f75f43d55bb7b1756b412dac37e43fc5f (diff)
downloadfetchmail-e3b44efa0c4af3b01a7c2156671807d44d180f1b.tar.gz
fetchmail-e3b44efa0c4af3b01a7c2156671807d44d180f1b.tar.bz2
fetchmail-e3b44efa0c4af3b01a7c2156671807d44d180f1b.zip
Bump version.
svn path=/branches/BRANCH_6-3/; revision=4971
-rw-r--r--NEWS35
-rw-r--r--configure.ac2
-rw-r--r--fetchmail-SA-2006-02.txt37
-rw-r--r--po/ca.po40
-rw-r--r--po/cs.po40
-rw-r--r--po/de.po40
-rw-r--r--po/en_GB.po40
-rw-r--r--po/es.po40
-rw-r--r--po/fr.po40
-rw-r--r--po/ja.po40
-rw-r--r--po/pl.po40
-rw-r--r--po/ru.po40
-rw-r--r--po/sq.po40
-rw-r--r--po/vi.po40
14 files changed, 263 insertions, 251 deletions
diff --git a/NEWS b/NEWS
index e3c6082b..8cedb0ac 100644
--- a/NEWS
+++ b/NEWS
@@ -41,25 +41,40 @@ change. MA = Matthias Andree, ESR = Eric S. Raymond, RF = Rob Funk.)
fetchmail 6.3.6 (not yet released):
-# SECURITY FIX (CHANGES BEHAVIOR):
-* Using at least one of the options "sslproto 'tls1'", "sslfingerprint" or
- "sslcertck" enforces STARTTLS for POP3 and IMAP and terminates the connection
- if unsuccessful. The same configuration causes permanent connection failure
- with POP2, which is obsolete and does not support STLS. fetchmail 6.3.5 and
- older had no way to enforce TLS. With those older versions, TLS was always
- opportunistic, but fetchmail would happily transmit the password in cleartext
- if STARTTLS failed. Reported by and fixed in cooperation with Isaac Wilcox.
+# SECURITY FIXES (CHANGE BEHAVIOUR):
+* CVE-2006-5867, fetchmail-SA-2006-02.txt:
+ Password disclosure vulnerability. This has several aspects:
- Configurations using --ssl --sslcertck however have been safe.
+ - Fetchmail now implies sslproto 'tls1' if the sslfingerprint or sslcertck
+ options are used, to be sure there is a certificate to check against.
+
+ - Fetchmail breaks the connection if the TLS negotiation (or verification, if
+ requested) fails with sslproto 'tls1' (also applies if this is implicit).
+
+ - POP3 connections ignored STLS altogether in many circumstances.
+
+ - POP3 connections could retry USER/PASS authentication even if strong
+ challenge-response schemes such as CRAM-MD5 had explicitly been requested,
+ if these were not advertised in the CAPA response.
+
+ - POP2 is obsolete and does not support STLS or anything beyond password-based
+ authentication. The attempt to use STLS or stronger authenticators causes
+ connection abort.
+
+ Configurations using --ssl --sslcertck however have been semi-safe in that
+ they would not expose the password over the wire.
# SECURITY FIX:
-* Repair regression in 6.3.5 that crashes fetchmail when a message with invalid
+* CVE-2006-5974, fetchmail-SA-2006-03.txt:
+ Repair regression in 6.3.5 that crashes fetchmail when a message with invalid
headers is found while fetchmail's mda option is in use. BerliOS bugs #9364,
#9412, #9449. Stack backtrace provided by Neil Hoggarth - thanks.
# BUG FIXES:
* Repair --logfile, broken in 6.3.5. BerliOS Bug #9059,
reported by Brian Harring.
+* POP3: Probe capabilities when Kerberos V5 is attempted.
+* RPOP: The password is now shrouded in the local logs.
* Robustness: If a stale lockfile cannot be deleted, truncate it to avoid
trouble later if the PID is recycled by a non-fetchmail process.
diff --git a/configure.ac b/configure.ac
index 046c45a5..8467bad0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl
dnl Process this file with autoconf to produce a configure script.
dnl
-AC_INIT([fetchmail],[6.3.6-rc3],[fetchmail-users@lists.berlios.de])
+AC_INIT([fetchmail],[6.3.6-rc4],[fetchmail-users@lists.berlios.de])
AC_CONFIG_SRCDIR([fetchmail.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_LIBOBJ_DIR([.])
diff --git a/fetchmail-SA-2006-02.txt b/fetchmail-SA-2006-02.txt
index 053b3a02..94be6cf2 100644
--- a/fetchmail-SA-2006-02.txt
+++ b/fetchmail-SA-2006-02.txt
@@ -45,8 +45,8 @@ control) files for fetchmail.
2. Problem description and Impact
=================================
-Fetchmail has no configuration facility to enforce TLS connections. This
-can cause passwords to be sent over unencrypted channels in some cases:
+Fetchmail has has several nasty password disclosure vulnerabilities for
+a long time. It was only recently that these have been found.
V1. sslcertck/sslfingerprint options should have implied "sslproto tls1"
in order to enforce TLS negotiation, but did not.
@@ -55,9 +55,16 @@ V2. Even with "sslproto tls1" in the config, fetches would go ahead
in plain text if STLS/STARTTLS wasn't available (not advertised,
or advertised but rejected).
-V3. POP3 fetches would completely ignore all TLS options whether
- available or not because it didn't issue CAPA before checking
- for STLS support.
+V3. POP3 fetches could completely ignore all TLS options whether
+ available or not because it didn't reliably issue CAPA before
+ checking for STLS support, and it would only try STLS if it had seen
+ the server's advertisement.
+
+V4. POP3 could fall back to using plain text passwords, even if strong
+ authentication had been configured.
+
+V5. POP2 would not complain if strong authentication or TLS had been
+ requested.
This can cause eavesdroppers to obtain the password, depending on the
authentication scheme that is configured or auto-selected, and
@@ -65,22 +72,12 @@ subsequently impersonate somebody else when logging into the upstream
server.
-3. Workarounds
-==============
-
-W1. If your upstream offers SSLv3-wrapped service on a dedicated port,
- use fetchmail --ssl --sslcertck --sslproto ssl3 on the command line,
- or equivalent in the run control file. This encrypts the whole session.
-
-The next workarounds do not encrypt the channel, but get along without
-password or mask it:
-
-W2. If your upstream offers authentication schemes that don't require
- cleartext credentials, use the --auth option to select a safe one, such
- as Kerberos, GSSAPI, CRAM-MD5, or perhaps OTP.
+3. Workaround
+=============
-W3. For POP3, if the upstream server supports APOP, you can use
- --protocol apop to select APOP authentication.
+If your upstream offers SSLv3-wrapped service on a dedicated port,
+use fetchmail --ssl --sslcertck --sslproto ssl3 on the command line,
+or equivalent in the run control file. This encrypts the whole session.
4. Solution
diff --git a/po/ca.po b/po/ca.po
index c1e5015c..44437bbf 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.5-b1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-19 19:40+0100\n"
+"POT-Creation-Date: 2006-11-25 10:23+0100\n"
"PO-Revision-Date: 2006-08-31 19:22+0200\n"
"Last-Translator: Ernest Adrogu Calveras <eadrogue@gmx.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -1682,86 +1682,86 @@ msgstr "S'ha identificat el protocol com a IMAP2 o IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "es far una pausa desprs de l'obtenci\n"
-#: imap.c:427 pop3.c:473
+#: imap.c:431 pop3.c:473
#, fuzzy, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: actualitzaci oportunista a TLS.\n"
-#: imap.c:435 pop3.c:481
+#: imap.c:440 pop3.c:482
#, fuzzy, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: actualitzaci oportunista a TLS.\n"
-#: imap.c:442
+#: imap.c:444
#, fuzzy, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: actualitzaci oportunista a TLS.\n"
-#: imap.c:553
+#: imap.c:555
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Es requereix capacitat per OTP no compilada en el fetchmail\n"
-#: imap.c:575 pop3.c:373
+#: imap.c:577 pop3.c:374
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Es requereix capacitat per NTLM no compilada en el fetchmail\n"
-#: imap.c:584
+#: imap.c:586
msgid "Required LOGIN capability not supported by server\n"
msgstr "El servidor no suporta la capacitat per LOGIN requerida\n"
-#: imap.c:648
+#: imap.c:650
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "recompte de missatges eliminats incorrecte (%d real != %d esperat)\n"
-#: imap.c:752 imap.c:811
+#: imap.c:754 imap.c:813
msgid "re-poll failed\n"
msgstr "la re-obtenci ha fallat\n"
-#: imap.c:760 imap.c:816
+#: imap.c:762 imap.c:818
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "hi ha %d missatge esperant desprs de la re-obtenci\n"
msgstr[1] "hi ha %d missatges esperant desprs de la re-obtenci\n"
-#: imap.c:777
+#: imap.c:779
msgid "mailbox selection failed\n"
msgstr "ha fallat la selecci de bstia\n"
-#: imap.c:781
+#: imap.c:783
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "hi ha %d missatge esperant desprs de la primera obtenci\n"
msgstr[1] "hi ha %d missatges esperant desprs de la primera obtenci\n"
-#: imap.c:795
+#: imap.c:797
msgid "expunge failed\n"
msgstr "la supressi de missatges ha fallat\n"
-#: imap.c:799
+#: imap.c:801
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "hi ha %d missatge esperant desprs de la supressi\n"
msgstr[1] "hi ha %d missatges esperant desprs de la supressi\n"
-#: imap.c:841
+#: imap.c:843
msgid "search for unseen messages failed\n"
msgstr "la recerca de missatges no llegits ha fallat\n"
-#: imap.c:869
+#: imap.c:871
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu s no llegit\n"
-#: imap.c:881 pop3.c:801
+#: imap.c:883 pop3.c:801
#, c-format
msgid "%u is first unseen\n"
msgstr "%u s el primer missatge no llegit\n"
-#: imap.c:972
+#: imap.c:974
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
@@ -2277,7 +2277,7 @@ msgstr ""
" --showdots mostra punts de progressi dhuc als fitxers de "
"registre\n"
-#: pop3.c:343
+#: pop3.c:344
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2285,7 +2285,7 @@ msgstr ""
"Atenci: s'ha detectat un \"Maillennium POP3/PROXY server\", s'usa RETR en "
"lloc de TOP.\n"
-#: pop3.c:494
+#: pop3.c:493
#, fuzzy, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: actualitzaci oportunista a TLS.\n"
diff --git a/po/cs.po b/po/cs.po
index e9635aa0..c64fa47f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail-6.2.6.alpha1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-19 19:40+0100\n"
+"POT-Creation-Date: 2006-11-25 10:23+0100\n"
"PO-Revision-Date: 2005-07-03 03:57+0200\n"
"Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -1655,45 +1655,45 @@ msgstr "Protokol rozpoznán jako IMAP2 nebo IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "po stahování budu nečinný\n"
-#: imap.c:427 pop3.c:473
+#: imap.c:431 pop3.c:473
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr ""
-#: imap.c:435 pop3.c:481
+#: imap.c:440 pop3.c:482
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr ""
-#: imap.c:442
+#: imap.c:444
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
-#: imap.c:553
+#: imap.c:555
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost OTP\n"
-#: imap.c:575 pop3.c:373
+#: imap.c:577 pop3.c:374
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost NTLM\n"
-#: imap.c:584
+#: imap.c:586
msgid "Required LOGIN capability not supported by server\n"
msgstr "Server nepodporuje požadovanou schopnost LOGIN\n"
-#: imap.c:648
+#: imap.c:650
#, fuzzy, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr ""
"zpráva %s@%s:%d nemá očekávanou velikost (%d ve skutečnosti != %d "
"očekáváno)\n"
-#: imap.c:752 imap.c:811
+#: imap.c:754 imap.c:813
msgid "re-poll failed\n"
msgstr "opakované stahování selhalo\n"
-#: imap.c:760 imap.c:816
+#: imap.c:762 imap.c:818
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
@@ -1701,12 +1701,12 @@ msgstr[0] "%d zpráva čeká po opětovném stahování\n"
msgstr[1] "%d zprávy čekají po opětovném stahování\n"
msgstr[2] "%d zpráv čeká po opětovném stahování\n"
-#: imap.c:777
+#: imap.c:779
msgid "mailbox selection failed\n"
msgstr "výběr poštovní schránky selhal\n"
# c-format
-#: imap.c:781
+#: imap.c:783
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
@@ -1714,11 +1714,11 @@ msgstr[0] "%d zpráva čeká po prvním stahování\n"
msgstr[1] "%d zprávy čekají po prvním stahování\n"
msgstr[2] "%d zpráv čeká po prvním stahování\n"
-#: imap.c:795
+#: imap.c:797
msgid "expunge failed\n"
msgstr "čištění selhalo\n"
-#: imap.c:799
+#: imap.c:801
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
@@ -1726,21 +1726,21 @@ msgstr[0] "%d zpráva čeká po vyčištění\n"
msgstr[1] "%d zprávy čekají po vyčištění\n"
msgstr[2] "%d zpráv čeká po vyčištění\n"
-#: imap.c:841
+#: imap.c:843
msgid "search for unseen messages failed\n"
msgstr "hledání nepřečtených zpráv selhalo\n"
-#: imap.c:869
+#: imap.c:871
#, fuzzy, c-format
msgid "%lu is unseen\n"
msgstr "%u nebyla přečtena\n"
-#: imap.c:881 pop3.c:801
+#: imap.c:883 pop3.c:801
#, c-format
msgid "%u is first unseen\n"
msgstr "%u je první nepřečtená\n"
-#: imap.c:972
+#: imap.c:974
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
@@ -2243,13 +2243,13 @@ msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
" --showdots zobrazovat tečky průběhu i v souborech se záznamy\n"
-#: pop3.c:343
+#: pop3.c:344
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr ""
-#: pop3.c:494
+#: pop3.c:493
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
diff --git a/po/de.po b/po/de.po
index de0112e0..ebe383cd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.4-rc2\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-19 19:40+0100\n"
+"POT-Creation-Date: 2006-11-25 10:23+0100\n"
"PO-Revision-Date: 2006-09-18 11:04+0200\n"
"Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -1688,87 +1688,87 @@ msgstr "Protokoll identifiziert als IMAP2 oder IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "werde nach Abfrage untätig sein\n"
-#: imap.c:427 pop3.c:473
+#: imap.c:431 pop3.c:473
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: Upgrade auf TLS erfolgreich.\n"
-#: imap.c:435 pop3.c:481
+#: imap.c:440 pop3.c:482
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: Upgrade auf TLS fehlgeschlagen.\n"
-#: imap.c:442
+#: imap.c:444
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
"%s: opportunistisches Upgrade auf TLS fehlgeschlagen, versuche Fortsetzung.\n"
-#: imap.c:553
+#: imap.c:555
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Benötigte OTP-Fähigkeit nicht in fetchmail einkompiliert\n"
-#: imap.c:575 pop3.c:373
+#: imap.c:577 pop3.c:374
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Benötigte NTLM-Fähigkeit nicht in fetchmail einkompiliert\n"
-#: imap.c:584
+#: imap.c:586
msgid "Required LOGIN capability not supported by server\n"
msgstr "Benötigte LOGIN-Fähigkeit nicht vom Server unterstützt\n"
-#: imap.c:648
+#: imap.c:650
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "unerwartete Expunge-Bestätigung (%d tatsächlich != %d erwartet)\n"
-#: imap.c:752 imap.c:811
+#: imap.c:754 imap.c:813
msgid "re-poll failed\n"
msgstr "erneute Abfrage fehlgeschlagen\n"
-#: imap.c:760 imap.c:816
+#: imap.c:762 imap.c:818
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d Nachricht wartet nach erneuter Abfrage\n"
msgstr[1] "%d Nachrichten warten nach erneuter Abfrage\n"
-#: imap.c:777
+#: imap.c:779
msgid "mailbox selection failed\n"
msgstr "Postfach-Auswahl fehlgeschlagen\n"
-#: imap.c:781
+#: imap.c:783
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d Nachricht wartet nach der ersten Abfrage\n"
msgstr[1] "%d Nachrichten warten nach der ersten Abfrage\n"
-#: imap.c:795
+#: imap.c:797
msgid "expunge failed\n"
msgstr "Säubern fehlgeschlagen\n"
-#: imap.c:799
+#: imap.c:801
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d Nachricht wartet nach dem Löschen\n"
msgstr[1] "%d Nachrichten warten nach dem Löschen\n"
-#: imap.c:841
+#: imap.c:843
msgid "search for unseen messages failed\n"
msgstr "Suche nach ungesehenen Nachrichten fehlgeschlagen\n"
-#: imap.c:869
+#: imap.c:871
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu ist ungesehen\n"
-#: imap.c:881 pop3.c:801
+#: imap.c:883 pop3.c:801
#, c-format
msgid "%u is first unseen\n"
msgstr "%u ist erste ungesehene\n"
-#: imap.c:972
+#: imap.c:974
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr "Warnung: ignoriere falsche Größendaten vom Server.\n"
@@ -2268,7 +2268,7 @@ msgstr " -r, --folder Namen des entfernten Ordners angeben\n"
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots Fortschrittspunkte auch in Log-Dateien zeigen\n"
-#: pop3.c:343
+#: pop3.c:344
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2276,7 +2276,7 @@ msgstr ""
"Warnung: „Maillennium POP3/PROXY-Server” gefunden, benutze RETR-Befehl statt "
"TOP.\n"
-#: pop3.c:494
+#: pop3.c:493
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 49e886b9..f0055c7c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.5\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-19 19:40+0100\n"
+"POT-Creation-Date: 2006-11-25 10:23+0100\n"
"PO-Revision-Date: 2006-11-02 06:58-0000\n"
"Last-Translator: David Lodge <dave@cirt.net>\n"
"Language-Team: English (British) <en_gb@li.org>\n"
@@ -1624,86 +1624,86 @@ msgstr "Protocol identified as IMAP2 or IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "will idle after poll\n"
-#: imap.c:427 pop3.c:473
+#: imap.c:431 pop3.c:473
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: upgrade to TLS succeeded.\n"
-#: imap.c:435 pop3.c:481
+#: imap.c:440 pop3.c:482
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: upgrade to TLS failed.\n"
-#: imap.c:442
+#: imap.c:444
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-#: imap.c:553
+#: imap.c:555
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Required OTP capability not compiled into fetchmail\n"
-#: imap.c:575 pop3.c:373
+#: imap.c:577 pop3.c:374
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Required NTLM capability not compiled into fetchmail\n"
-#: imap.c:584
+#: imap.c:586
msgid "Required LOGIN capability not supported by server\n"
msgstr "Required LOGIN capability not supported by server\n"
-#: imap.c:648
+#: imap.c:650
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "mail expunge mismatch (%d actual != %d expected)\n"
-#: imap.c:752 imap.c:811
+#: imap.c:754 imap.c:813
msgid "re-poll failed\n"
msgstr "re-poll failed\n"
-#: imap.c:760 imap.c:816
+#: imap.c:762 imap.c:818
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d message waiting after re-poll\n"
msgstr[1] "%d messages waiting after re-poll\n"
-#: imap.c:777
+#: imap.c:779
msgid "mailbox selection failed\n"
msgstr "mailbox selection failed\n"
-#: imap.c:781
+#: imap.c:783
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d message waiting after first poll\n"
msgstr[1] "%d messages waiting after first poll\n"
-#: imap.c:795
+#: imap.c:797
msgid "expunge failed\n"
msgstr "expunge failed\n"
-#: imap.c:799
+#: imap.c:801
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d message waiting after expunge\n"
msgstr[1] "%d messages waiting after expunge\n"
-#: imap.c:841
+#: imap.c:843
msgid "search for unseen messages failed\n"
msgstr "search for unseen messages failed\n"
-#: imap.c:869
+#: imap.c:871
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu is unseen\n"
-#: imap.c:881 pop3.c:801
+#: imap.c:883 pop3.c:801
#, c-format
msgid "%u is first unseen\n"
msgstr "%u is first unseen\n"
-#: imap.c:972
+#: imap.c:974
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
@@ -2193,7 +2193,7 @@ msgstr " -r, --folder specify remote folder name\n"
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots show progress dots even in logfiles\n"
-#: pop3.c:343
+#: pop3.c:344
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2201,7 +2201,7 @@ msgstr ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
-#: pop3.c:494
+#: pop3.c:493
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
diff --git a/po/es.po b/po/es.po
index 87c95cd2..6cbf1833 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.4-rc1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-19 19:40+0100\n"
+"POT-Creation-Date: 2006-11-25 10:23+0100\n"
"PO-Revision-Date: 2006-09-15 11:52+0200\n"
"Last-Translator: Héctor García <hector@el-mundo.net>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -1700,86 +1700,86 @@ msgstr "Protocolo identificado como IMAP2 o IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "descansará después de inquirir\n"
-#: imap.c:427 pop3.c:473
+#: imap.c:431 pop3.c:473
#, fuzzy, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: actualización oportunista a TLS.\n"
-#: imap.c:435 pop3.c:481
+#: imap.c:440 pop3.c:482
#, fuzzy, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: actualización oportunista a TLS.\n"
-#: imap.c:442
+#: imap.c:444
#, fuzzy, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: actualización oportunista a TLS.\n"
-#: imap.c:553
+#: imap.c:555
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "La capacidad OTP requerida no fue compilada en fetchmail\n"
-#: imap.c:575 pop3.c:373
+#: imap.c:577 pop3.c:374
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "La capacidad NTLM requerida no fue compilada en fetchmail\n"
-#: imap.c:584
+#: imap.c:586
msgid "Required LOGIN capability not supported by server\n"
msgstr "La capacidad LOGIN requerida no es soportada por el servidor\n"
-#: imap.c:648
+#: imap.c:650
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "inconsistencia en borrado de mensajes (%d actual != %d esperado)\n"
-#: imap.c:752 imap.c:811
+#: imap.c:754 imap.c:813
msgid "re-poll failed\n"
msgstr "falló el reintento de consulta\n"
-#: imap.c:760 imap.c:816
+#: imap.c:762 imap.c:818
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "Queda %d mensaje esperando tras reintentar la consulta\n"
msgstr[1] "Quedan %d mensajes esperando tras reintentar la consulta\n"
-#: imap.c:777
+#: imap.c:779
msgid "mailbox selection failed\n"
msgstr "falló la selección de casilla\n"
-#: imap.c:781
+#: imap.c:783
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "Queda %d mensaje esperando tras la consulta inicial\n"
msgstr[1] "Quedan %d mensajes esperando tras la consulta inicial\n"
-#: imap.c:795
+#: imap.c:797
msgid "expunge failed\n"
msgstr "falló la eliminación\n"
-#: imap.c:799
+#: imap.c:801
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "Queda %d mensaje esperando tras la eliminación\n"
msgstr[1] "Quedan %d mensajes esperando tras la eliminación\n"
-#: imap.c:841
+#: imap.c:843
msgid "search for unseen messages failed\n"
msgstr "la búsqueda de mensajes no visto falló\n"
-#: imap.c:869
+#: imap.c:871
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu no fue visto\n"
-#: imap.c:881 pop3.c:801
+#: imap.c:883 pop3.c:801
#, c-format
msgid "%u is first unseen\n"
msgstr "%u es el primero que no fue visto\n"
-#: imap.c:972
+#: imap.c:974
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
@@ -2303,7 +2303,7 @@ msgstr ""
" --showdots mostrar puntos de progreso incluso en los archivos de "
"registro\n"
-#: pop3.c:343
+#: pop3.c:344
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2311,7 +2311,7 @@ msgstr ""
"Aviso: encontrado \"Maillennium POP3/PROXY server\", usando el comando RETR "
"en lugar de TOP.\n"
-#: pop3.c:494
+#: pop3.c:493
#, fuzzy, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: actualización oportunista a TLS.\n"
diff --git a/po/fr.po b/po/fr.po
index c068ba0d..746678a3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.2.9-rc9\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-19 19:40+0100\n"
+"POT-Creation-Date: 2006-11-25 10:23+0100\n"
"PO-Revision-Date: 2005-12-18 11:50+0100\n"
"Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -1703,87 +1703,87 @@ msgstr "Protocole identifié comme étant IMAP2 ou IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "attendra après la réception\n"
-#: imap.c:427 pop3.c:473
+#: imap.c:431 pop3.c:473
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr ""
-#: imap.c:435 pop3.c:481
+#: imap.c:440 pop3.c:482
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr ""
-#: imap.c:442
+#: imap.c:444
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
-#: imap.c:553
+#: imap.c:555
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "La fonctionnalité OTP requise n'est pas supportée par fetchmail\n"
-#: imap.c:575 pop3.c:373
+#: imap.c:577 pop3.c:374
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "La fonctionnalité NTLM requise n'est pas supportée par fetchmail.\n"
-#: imap.c:584
+#: imap.c:586
msgid "Required LOGIN capability not supported by server\n"
msgstr "La fonction LOGIN requise n'est pas supportée par le serveur\n"
-#: imap.c:648
+#: imap.c:650
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr ""
"pas de concordance de la punge des messages (%d effectiv != %d attendue)\n"
-#: imap.c:752 imap.c:811
+#: imap.c:754 imap.c:813
msgid "re-poll failed\n"
msgstr "échec durant la re-réception\n"
-#: imap.c:760 imap.c:816
+#: imap.c:762 imap.c:818
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d message en attente après le nouveau poll\n"
msgstr[1] "%d messages en attente après le nouveau poll\n"
-#: imap.c:777
+#: imap.c:779
msgid "mailbox selection failed\n"
msgstr "échec de la sélection de boîte aux lettres\n"
-#: imap.c:781
+#: imap.c:783
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d message en attente après le premier poll\n"
msgstr[1] "%d messages en attente après le premier poll\n"
-#: imap.c:795
+#: imap.c:797
msgid "expunge failed\n"
msgstr "échec de la purge\n"
-#: imap.c:799
+#: imap.c:801
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d message en attente après la purge\n"
msgstr[1] "%d messages en attente après la purge\n"
-#: imap.c:841
+#: imap.c:843
msgid "search for unseen messages failed\n"
msgstr "échec de la recherche des messages non-vus\n"
-#: imap.c:869
+#: imap.c:871
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu n'est pas vu\n"
-#: imap.c:881 pop3.c:801
+#: imap.c:883 pop3.c:801
#, c-format
msgid "%u is first unseen\n"
msgstr "%u est le premier a n'avoir pas été vu\n"
-#: imap.c:972
+#: imap.c:974
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
@@ -2299,7 +2299,7 @@ msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
" --showdots affiche des points de progression, même dans le journal\n"
-#: pop3.c:343
+#: pop3.c:344
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2307,7 +2307,7 @@ msgstr ""
"Avertissement: trouvé «Maillennium POP3/PROXY server», la commande RETR est "
"utilisé au lieu de TOP.\n"
-#: pop3.c:494
+#: pop3.c:493
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 3f613796..1d3f0f79 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.6-rc2\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-19 19:40+0100\n"
+"POT-Creation-Date: 2006-11-25 10:23+0100\n"
"PO-Revision-Date: 2006-11-17 01:41+0900\n"
"Last-Translator: Takeshi Hamasaki <hma@syd.odn.ne.jp>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -1659,84 +1659,84 @@ msgstr "プロトコルは IMAP2 又は IMAP2BIS と認識されました。\n"
msgid "will idle after poll\n"
msgstr "接続の後、休止します。\n"
-#: imap.c:427 pop3.c:473
+#: imap.c:431 pop3.c:473
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: TLS へのアップグレードに成功。\n"
-#: imap.c:435 pop3.c:481
+#: imap.c:440 pop3.c:482
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: TLS へのアップグレードに失敗。\n"
-#: imap.c:442
+#: imap.c:444
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: TLS への適合的アップグレードに失敗、継続可能か試しています\n"
-#: imap.c:553
+#: imap.c:555
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr ""
"OTP が要求されましたが、fetchmail が OTP 対応でコンパイルされていません。\n"
-#: imap.c:575 pop3.c:373
+#: imap.c:577 pop3.c:374
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "要求された NTLM 処理能力は fetchmail に組み込まれていません。\n"
-#: imap.c:584
+#: imap.c:586
msgid "Required LOGIN capability not supported by server\n"
msgstr "要求された LOGIN 処理能力はサーバでサポートされていません。\n"
-#: imap.c:648
+#: imap.c:650
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "メッセージの大きさが合いません (%d (実際) != %d (予想)) \n"
-#: imap.c:752 imap.c:811
+#: imap.c:754 imap.c:813
msgid "re-poll failed\n"
msgstr "再アクセスに失敗しました。\n"
-#: imap.c:760 imap.c:816
+#: imap.c:762 imap.c:818
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d 通のメッセージが再アクセスの後に存在します。\n"
-#: imap.c:777
+#: imap.c:779
msgid "mailbox selection failed\n"
msgstr "メールボックスの選択に失敗しました\n"
-#: imap.c:781
+#: imap.c:783
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "最初のアクセスから %d 通のメッセージがあります。\n"
-#: imap.c:795
+#: imap.c:797
msgid "expunge failed\n"
msgstr "削除に失敗しました。\n"
-#: imap.c:799
+#: imap.c:801
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "削除の後、%d 通のメッセージが残っています。\n"
-#: imap.c:841
+#: imap.c:843
msgid "search for unseen messages failed\n"
msgstr "未読メッセージの検索に失敗しました。\n"
-#: imap.c:869
+#: imap.c:871
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu は未読です。\n"
-#: imap.c:881 pop3.c:801
+#: imap.c:883 pop3.c:801
#, c-format
msgid "%u is first unseen\n"
msgstr "%u は最初の未読メッセージです。\n"
-#: imap.c:972
+#: imap.c:974
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
@@ -2245,7 +2245,7 @@ msgstr " -r, --folder サーバのメールフォルダを指定します\
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots ログファイルにも進行状況を示す . を書き込みます\n"
-#: pop3.c:343
+#: pop3.c:344
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2253,7 +2253,7 @@ msgstr ""
"警告: Maillennium POP3/プロクシサーバです。TOP の代わりに RETR コマンドを使用"
"します。\n"
-#: pop3.c:494
+#: pop3.c:493
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: TLS への適合的アップグレードに失敗、継続可能か試しています。\n"
diff --git a/po/pl.po b/po/pl.po
index d00b773b..2e59792c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.6-rc2\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-19 19:40+0100\n"
+"POT-Creation-Date: 2006-11-25 10:23+0100\n"
"PO-Revision-Date: 2006-11-16 17:47+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -1685,43 +1685,43 @@ msgstr "Protok rozpoznany jako IMAP2 lub IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "przejdzie w stan bezczynnoci po odpytaniu\n"
-#: imap.c:427 pop3.c:473
+#: imap.c:431 pop3.c:473
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: przejcie na TLS powiodo si.\n"
-#: imap.c:435 pop3.c:481
+#: imap.c:440 pop3.c:482
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: przejcie na TLS nie powiodo si.\n"
-#: imap.c:442
+#: imap.c:444
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: zgodne przejcie na TLS nie powiodo si, prba kontynuacji\n"
-#: imap.c:553
+#: imap.c:555
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Wymagana metoda uwierzytelnienia OTP nie wkompilowana w fetchmaila\n"
-#: imap.c:575 pop3.c:373
+#: imap.c:577 pop3.c:374
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Wymagana metoda uwierzytelnienia NTLM nie wkompilowana w fetchmaila\n"
-#: imap.c:584
+#: imap.c:586
msgid "Required LOGIN capability not supported by server\n"
msgstr "Serwer nie obsuguje wymaganej metody uwierzytelnienia LOGIN\n"
-#: imap.c:648
+#: imap.c:650
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "niezgodno przy usuwaniu poczty (faktyczna %d != oczekiwana %d)\n"
-#: imap.c:752 imap.c:811
+#: imap.c:754 imap.c:813
msgid "re-poll failed\n"
msgstr "ponowne poczenie nie powiodo si\n"
-#: imap.c:760 imap.c:816
+#: imap.c:762 imap.c:818
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
@@ -1729,11 +1729,11 @@ msgstr[0] "%d list oczekujcy po ponownym pobraniu\n"
msgstr[1] "%d listy oczekujce po ponownym pobraniu\n"
msgstr[2] "%d listw oczekujcych po ponownym pobraniu\n"
-#: imap.c:777
+#: imap.c:779
msgid "mailbox selection failed\n"
msgstr "wybr skrzynki zakoczy si niepowodzeniem\n"
-#: imap.c:781
+#: imap.c:783
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
@@ -1741,11 +1741,11 @@ msgstr[0] "%d list oczekujcy po pierwszym pobraniu\n"
msgstr[1] "%d listy oczekujce po pierwszym pobraniu\n"
msgstr[2] "%d listw oczekujcych po pierwszym pobraniu\n"
-#: imap.c:795
+#: imap.c:797
msgid "expunge failed\n"
msgstr "usuwanie nie powiodo si\n"
-#: imap.c:799
+#: imap.c:801
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
@@ -1753,21 +1753,21 @@ msgstr[0] "%d list oczekujcy po usuwaniu\n"
msgstr[1] "%d listy oczekujce po usuwaniu\n"
msgstr[2] "%d listw oczekujcych po usuwaniu\n"
-#: imap.c:841
+#: imap.c:843
msgid "search for unseen messages failed\n"
msgstr "poszukiwanie nieprzeczytanych listw nie powiodo si\n"
-#: imap.c:869
+#: imap.c:871
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu jest nieprzeczytany\n"
-#: imap.c:881 pop3.c:801
+#: imap.c:883 pop3.c:801
#, c-format
msgid "%u is first unseen\n"
msgstr "%u jest pierwszym nieprzeczytanym\n"
-#: imap.c:972
+#: imap.c:974
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
@@ -2285,7 +2285,7 @@ msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
" --showdots pokazuje kropki oznaczajce postp take w logach\n"
-#: pop3.c:343
+#: pop3.c:344
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2293,7 +2293,7 @@ msgstr ""
"Uwaga: Odkryto serwer \"POP3/PROXY Maillennium\", uycie polecenia RETR "
"zamiast TOP.\n"
-#: pop3.c:494
+#: pop3.c:493
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: zgodne przejcie na TLS nie powiodo si, prba kontynuacji.\n"
diff --git a/po/ru.po b/po/ru.po
index 3ba82e3d..7243d20e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.6-rc3\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-19 19:40+0100\n"
+"POT-Creation-Date: 2006-11-25 10:23+0100\n"
"PO-Revision-Date: 2006-11-21 20:59+0200\n"
"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -1675,88 +1675,88 @@ msgstr "Протокол идентифицирован как IMAP2 или IMAP
msgid "will idle after poll\n"
msgstr "будет приостановлен после опроса\n"
-#: imap.c:427 pop3.c:473
+#: imap.c:431 pop3.c:473
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: обновление до TLS выполнено успешно.\n"
-#: imap.c:435 pop3.c:481
+#: imap.c:440 pop3.c:482
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: сбой обновления до TLS.\n"
-#: imap.c:442
+#: imap.c:444
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
"%s: сбой принудительного обновления до TLS; выполняется попытка продолжить "
"работу\n"
-#: imap.c:553
+#: imap.c:555
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Fetchmail скомпилирован без требуемой поддержки OTP\n"
-#: imap.c:575 pop3.c:373
+#: imap.c:577 pop3.c:374
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Fetchmail скомпилирован без требуемой поддержки NTLM\n"
-#: imap.c:584
+#: imap.c:586
msgid "Required LOGIN capability not supported by server\n"
msgstr "Требуемая опция LOGIN не поддерживается сервером\n"
-#: imap.c:648
+#: imap.c:650
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "разногласие при удалении писем (%d на самом деле != %d ожидалось)\n"
-#: imap.c:752 imap.c:811
+#: imap.c:754 imap.c:813
msgid "re-poll failed\n"
msgstr "не удалось повторить опрос\n"
-#: imap.c:760 imap.c:816
+#: imap.c:762 imap.c:818
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "ожидается %d сообщение после повторного опроса\n"
msgstr[1] "ожидается %d сообщений после повторного опроса\n"
-#: imap.c:777
+#: imap.c:779
msgid "mailbox selection failed\n"
msgstr "не удалось выбрать почтовый ящик\n"
-#: imap.c:781
+#: imap.c:783
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "ожидается %d сообщение после первого опроса\n"
msgstr[1] "ожидается %d сообщений после первого опроса\n"
-#: imap.c:795
+#: imap.c:797
msgid "expunge failed\n"
msgstr "не удалось удалить\n"
-#: imap.c:799
+#: imap.c:801
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "ожидается %d сообщение после удаления\n"
msgstr[1] "ожидается %d сообщений после удаления\n"
-#: imap.c:841
+#: imap.c:843
msgid "search for unseen messages failed\n"
msgstr "сбой поиска непросмотренных сообщений\n"
-#: imap.c:869
+#: imap.c:871
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu не просмотрено\n"
-#: imap.c:881 pop3.c:801
+#: imap.c:883 pop3.c:801
#, c-format
msgid "%u is first unseen\n"
msgstr "%u первое не просмотренное\n"
-#: imap.c:972
+#: imap.c:974
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
@@ -2272,7 +2272,7 @@ msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
" --showdots отображение точечной строки прогресса даже в log-файлах\n"
-#: pop3.c:343
+#: pop3.c:344
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2280,7 +2280,7 @@ msgstr ""
"Предупреждение: найден POP3/PROXY-сервер Maillennium; вместо TOP "
"используется команда RETR.\n"
-#: pop3.c:494
+#: pop3.c:493
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
diff --git a/po/sq.po b/po/sq.po
index e820ecbf..f48db2f7 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.2.9-rc9\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-19 19:40+0100\n"
+"POT-Creation-Date: 2006-11-25 10:23+0100\n"
"PO-Revision-Date: 2005-11-18 22:25+0200\n"
"Last-Translator: Besnik Bleta <besnik@spymac.com>\n"
"Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -1689,87 +1689,87 @@ msgstr "Protokoll i identifikuar si IMAP2 ose IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "do t rrij bosh pas vjeljeje\n"
-#: imap.c:427 pop3.c:473
+#: imap.c:431 pop3.c:473
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr ""
-#: imap.c:435 pop3.c:481
+#: imap.c:440 pop3.c:482
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr ""
-#: imap.c:442
+#: imap.c:444
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
-#: imap.c:553
+#: imap.c:555
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Aftsi e nevojshme OTP e paprpiluar tek fetchmail-i\n"
-#: imap.c:575 pop3.c:373
+#: imap.c:577 pop3.c:374
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Aftsi e nevojshme NTML e paprpiluar tek fetchmail-i\n"
-#: imap.c:584
+#: imap.c:586
msgid "Required LOGIN capability not supported by server\n"
msgstr "Aftsi e nevojshme LOGIN e pambuluar prej shrbyesit\n"
-#: imap.c:648
+#: imap.c:650
#, fuzzy, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr ""
"mesazhi %s@%s:%d nuk pat gjatsin e pritur (%d aktualja != %d e pritshmja)\n"
-#: imap.c:752 imap.c:811
+#: imap.c:754 imap.c:813
msgid "re-poll failed\n"
msgstr "rivjelja dshtoi\n"
-#: imap.c:760 imap.c:816
+#: imap.c:762 imap.c:818
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d mesazh n pritje pas rivjeljes\n"
msgstr[1] "%d mesazhe n pritje pas rivjeljes\n"
-#: imap.c:777
+#: imap.c:779
msgid "mailbox selection failed\n"
msgstr "przgjedhja e kutis postare dshtoi\n"
-#: imap.c:781
+#: imap.c:783
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d mesazh n pritje pas vjeljes s par\n"
msgstr[1] "%d mesazhe n pritje pas vjeljes s par\n"
-#: imap.c:795
+#: imap.c:797
msgid "expunge failed\n"
msgstr "shuarja dshtoi\n"
-#: imap.c:799
+#: imap.c:801
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d mesazh n pritje pas shuarjes\n"
msgstr[1] "%d mesazhe n pritje pas shuarjes\n"
-#: imap.c:841
+#: imap.c:843
msgid "search for unseen messages failed\n"
msgstr "krkimi pr mesazhe t pavrejtur dshtoi\n"
-#: imap.c:869
+#: imap.c:871
#, fuzzy, c-format
msgid "%lu is unseen\n"
msgstr "%u sht i pavrejtur\n"
-#: imap.c:881 pop3.c:801
+#: imap.c:883 pop3.c:801
#, c-format
msgid "%u is first unseen\n"
msgstr "%u sht i pari i pavrejtur\n"
-#: imap.c:972
+#: imap.c:974
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
@@ -2272,13 +2272,13 @@ msgstr " -r, --folder cakto emr dosjeje t largt\n"
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots shfaq pika prparimi edhe n kartela regjistrimi\n"
-#: pop3.c:343
+#: pop3.c:344
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr ""
-#: pop3.c:494
+#: pop3.c:493
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
diff --git a/po/vi.po b/po/vi.po
index d910ce32..73165c0c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.6-rc2\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-11-19 19:40+0100\n"
+"POT-Creation-Date: 2006-11-25 10:23+0100\n"
"PO-Revision-Date: 2006-11-19 13:45+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -1652,85 +1652,85 @@ msgstr "Giao thức được phát hiện là IMAP2 hay IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "sẽ nghỉ sau khi thăm dò\n"
-#: imap.c:427 pop3.c:473
+#: imap.c:431 pop3.c:473
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: việc nâng cấp lên TLS đã thành công.\n"
-#: imap.c:435 pop3.c:481
+#: imap.c:440 pop3.c:482
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: việc nâng cấp lên TLS bị lỗi.\n"
-#: imap.c:442
+#: imap.c:444
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
"%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa bị lỗi nên thử tiếp tục\n"
-#: imap.c:553
+#: imap.c:555
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Khả năng OTP cần thiết không được biên dịch vào fetchmail\n"
-#: imap.c:575 pop3.c:373
+#: imap.c:577 pop3.c:374
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Khả năng NTLM cần thiết không được biên dịch vào fetchmail\n"
-#: imap.c:584
+#: imap.c:586
msgid "Required LOGIN capability not supported by server\n"
msgstr ""
"Khả năng LOGIN (đăng nhập) cần thiết không được hỗ trợ bởi máy phục vụ\n"
-#: imap.c:648
+#: imap.c:650
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "không khớp được khi xoá hẳn thư (%d thật != %d ngờ)\n"
-#: imap.c:752 imap.c:811
+#: imap.c:754 imap.c:813
msgid "re-poll failed\n"
msgstr "việc thăm dò lại bị lỗi\n"
-#: imap.c:760 imap.c:816
+#: imap.c:762 imap.c:818
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d thư đợi sau khi thăm dò lại\n"
-#: imap.c:777
+#: imap.c:779
msgid "mailbox selection failed\n"
msgstr "việc chọn hộp thư bị lỗi\n"
-#: imap.c:781
+#: imap.c:783
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d thư đợi sau khi thăm dò lần thứ nhất\n"
-#: imap.c:795
+#: imap.c:797
msgid "expunge failed\n"
msgstr "việc xoá hẳn bị lỗi\n"
-#: imap.c:799
+#: imap.c:801
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d thư đợi sau khi xoá hẳn\n"
-#: imap.c:841
+#: imap.c:843
msgid "search for unseen messages failed\n"
msgstr "việc tìm kiếm các thư chưa xem bị lỗi\n"
-#: imap.c:869
+#: imap.c:871
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu chưa xem\n"
-#: imap.c:881 pop3.c:801
+#: imap.c:883 pop3.c:801
#, c-format
msgid "%u is first unseen\n"
msgstr "%u là thư đầu chưa xem\n"
-#: imap.c:972
+#: imap.c:974
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
@@ -2251,7 +2251,7 @@ msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
" --showdots _hiện các chấm_ tiến hành ngay cả trong tập tin ghi lưu\n"
-#: pop3.c:343
+#: pop3.c:344
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2259,7 +2259,7 @@ msgstr ""
"Cảnh báo : tìm thấy « Maillennium POP3/PROXY server » nên dùng lệnh RETR "
"thay vào TOP.\n"
-#: pop3.c:494
+#: pop3.c:493
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""