* some of the logging output is not very helpful
* some of the documentation is still not up to date
+# IMPORTANT CHANGE:
+* sslproto 'tls1' enforces STARTTLS for POP3/IMAP and terminates the connection
+ if unsuccessful. The same configuration causes connection failure with POP2.
+ Reported by Isaac Wilcox.
+
# BUG FIXES:
* Repair --logfile, broken in 6.3.5. BerliOS Bug #9059,
reported by Brian Harring.
dnl Process this file with autoconf to produce a configure script.
dnl
-AC_INIT([fetchmail],[6.3.5],[fetchmail-users@lists.berlios.de])
+AC_INIT([fetchmail],[6.3.6-rc1],[fetchmail-users@lists.berlios.de])
AC_CONFIG_SRCDIR([fetchmail.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_LIBOBJ_DIR([.])
(Keyword: ssl)
Causes the connection to the mail server to be encrypted via SSL. Connect
to the server using the specified base protocol over a connection secured
-by SSL. SSL support must be present at the server.
+by SSL. This option defeats TLS negotiation. Use \-\-sslcertck to
+validate the certificates presented by the server.
.sp
Note that fetchmail may still try to negotiate TLS even if this option
is not given. You can use the \-\-sslproto option to defeat this
(Keyword: sslproto)
Forces an SSL or TLS protocol. Possible values are '\fBSSL2\fR',
\&'\fBSSL3\fR', '\fBSSL23\fR', and '\fBTLS1\fR'. Try this if the default
-handshake does not work for your server. To defeat automatic TLSv1
-negotiation when the server advertises STARTTLS or STLS, use \fB''\fR or
-\&'\fBSSL23\fR'. This option, even if the argument is the empty string,
-will also suppress the diagnostic 'SERVER: opportunistic upgrade to
-TLS.' message in verbose mode. The default is to try appropriate
-protocols depending on context.
+handshake does not work for your server. Use this option with
+'\fBTLS1\fR' to enforce a TLS connection. To defeat opportunistic TLSv1
+negotiation when the server advertises STARTTLS or STLS, use \fB''\fR.
+This option, even if the argument is the empty string, will also
+suppress the diagnostic 'SERVER: opportunistic upgrade to TLS.' message
+in verbose mode. The default is to try appropriate protocols depending
+on context.
.TP
.B \-\-sslcertck
(Keyword: sslcertck)
local trusted certificates (see the \fBsslcertpath\fR option). If the server
certificate is not signed by one of the trusted ones (directly or indirectly),
the SSL connection will fail, regardless of the \fBsslfingerprint\fR
-option. This checking should prevent man-in-the-middle attacks against
-the SSL connection. Note that CRLs are seemingly not currently supported
-by OpenSSL in certificate verification! Your system clock should be
-reasonably accurate when using this option.
+option. This checking is required, but not sufficient, to prevent
+man-in-the-middle attacks against the SSL connection. Use \-\-ssl or
+\-\-sslproto to enforce SSL or TLS. Note that CRLs are seemingly not
+currently supported by OpenSSL in certificate verification! Your system
+clock should be reasonably accurate when using this option.
.IP
Note that this optional behavior may become default behavior in future
fetchmail versions.
.PP
You can access SSL encrypted services by specifying the \-\-ssl option.
You can also do this using the "ssl" user option in the .fetchmailrc
-file. With SSL encryption enabled, queries are initiated over a connection
-after negotiating an SSL session. Some services, such as POP3 and IMAP,
-have different well known ports defined for the SSL encrypted services.
-The encrypted ports will be selected automatically when SSL is enabled and
-no explicit port is specified.
-.PP
-When connecting to an SSL encrypted server, the server presents a certificate
+file. With SSL encryption enabled, queries are initiated over a connection
+after negotiating an SSL session, and the connection fails if SSL cannot
+be negotiated. Some services, such as POP3 and IMAP, have different
+well known ports defined for the SSL encrypted services. The encrypted
+ports will be selected automatically when SSL is enabled and no explicit
+port is specified. The \-\-sslproto option can be used to select the SSL
+protocols (default: v2 or v3). The \-\-sslcertck command line or
+sslcertck run control file option should be used to force strict
+certificate checking - see below.
+.PP
+If SSL is not configured, fetchmail may opportunistically try to use
+TLS. It can be forced to use TLS by using \-\-sslproto "TLS1". TLS
+connections use the same port as the unencrypted version of the
+protocol. The \-\-sslcertck command line or sslcertck run control file
+option should be used to force strict certificate checking - see below.
+.PP
+When connecting to an SSL or TLS encrypted server, the server presents a certificate
to the client for validation. The certificate is checked to verify that
the common name in the certificate matches the name of the server being
contacted and that the effective and expiration dates in the certificate
indicate that it is currently valid. If any of these checks fail, a warning
message is printed, but the connection continues. The server certificate
does not need to be signed by any specific Certifying Authority and may
-be a "self-signed" certificate.
+be a "self-signed" certificate. If the \-\-sslcertck command line option
+or sslcertck run control file option is used, fetchmail will instead
+abort if any of these checks fail. Use of the sslcertck or \-\-sslcertck
+option is advised.
.PP
Some SSL encrypted servers may request a client side certificate. A client
side public SSL certificate and private SSL key may be specified. If
active attacker. It's clearly an improvement over sending the
passwords in clear but you should be aware that a man-in-the-middle
attack is trivially possible (in particular with tools such as dsniff,
-http://monkey.org/~dugsong/dsniff/). Use of an ssh tunnel (see
-below for some examples) is preferable if you care seriously about the
-security of your mailbox.
+http://monkey.org/~dugsong/dsniff/). Use of strict certificate checking
+with a certification authority recognized by server and client, or
+perhaps of an ssh tunnel (see below for some examples) is preferable if
+you care seriously about the security of your mailbox and passwords.
.SS ESMTP AUTH
.PP
.B fetchmail
int ok = 0;
#ifdef SSL_ENABLE
flag did_stls = FALSE;
+ flag using_tls = FALSE;
#endif /* SSL_ENABLE */
(void)greeting;
if (!ctl->sslproto && !ctl->wehaveauthed)
{
ctl->sslproto = xstrdup("");
- /* repoll immediately */
+ /* repoll immediately with TLS disabled */
return(PS_REPOLL);
}
report(stderr,
- GT_("SSL connection failed.\n"));
+ GT_("TLS connection failed.\n"));
return PS_SOCKET;
} else {
+ using_tls = TRUE;
if (outlevel >= O_VERBOSE && !ctl->sslproto)
report(stdout, GT_("%s: opportunistic upgrade to TLS.\n"), realhost);
}
*/
capa_probe(sock, ctl);
}
+ /* Check if TLS was enforced. */
+ if ((ctl->sslproto && !strcasecmp(ctl->sslproto,"tls1")) && !ctl->use_ssl && !using_tls) {
+ report(stderr, GT_("TLS connection failed.\n"));
+ return PS_SOCKET;
+ }
#endif /* SSL_ENABLE */
/*
msgstr ""
"Project-Id-Version: fetchmail 6.3.5-b1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+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"
msgid "Fetchmail could not reach the mail server %s:"
msgstr "El fetchmail no ha pogut contactar amb el servidor %s:"
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
msgid "SSL connection failed.\n"
msgstr "La conexió SSL ha fallat.\n"
msgid "will idle after poll\n"
msgstr "es farà una pausa després de l'obtenció\n"
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "La conexió SSL ha fallat.\n"
+
+#: imap.c:429 pop3.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
msgstr "%s: actualització oportunista a TLS.\n"
-#: imap.c:540
+#: imap.c:547
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Es requereix capacitat per OTP no compilada en el fetchmail\n"
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Es requereix capacitat per NTLM no compilada en el fetchmail\n"
-#: imap.c:571
+#: imap.c:578
msgid "Required LOGIN capability not supported by server\n"
msgstr "El servidor no suporta la capacitat per LOGIN requerida\n"
-#: imap.c:645
+#: imap.c:652
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "recompte de missatges eliminats incorrecte (%d real != %d esperat)\n"
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
msgid "re-poll failed\n"
msgstr "la re-obtenció ha fallat\n"
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
#, 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 després de la re-obtenció\n"
msgstr[1] "hi ha %d missatges esperant després de la re-obtenció\n"
-#: imap.c:774
+#: imap.c:781
msgid "mailbox selection failed\n"
msgstr "ha fallat la selecció de bústia\n"
-#: imap.c:778
+#: imap.c:785
#, 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 després de la primera obtenció\n"
msgstr[1] "hi ha %d missatges esperant després de la primera obtenció\n"
-#: imap.c:792
+#: imap.c:799
msgid "expunge failed\n"
msgstr "la supressió de missatges ha fallat\n"
-#: imap.c:796
+#: imap.c:803
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "hi ha %d missatge esperant després de la supressió\n"
msgstr[1] "hi ha %d missatges esperant després de la supressió\n"
-#: imap.c:838
+#: imap.c:845
msgid "search for unseen messages failed\n"
msgstr "la recerca de missatges no llegits ha fallat\n"
-#: imap.c:866
+#: imap.c:873
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu és no llegit\n"
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
#, c-format
msgid "%u is first unseen\n"
msgstr "%u és el primer missatge no llegit\n"
-#: imap.c:969
+#: imap.c:976
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr "No s'ha pogut desxifrar la codificació OTP\n"
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
msgid "Secret pass phrase: "
msgstr "Contrasenya secreta: "
" --showdots mostra punts de progressió àdhuc als fitxers de "
"registre\n"
-#: pop3.c:342
+#: pop3.c:343
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
"lloc de TOP.\n"
# timestamp: marca horària
-#: pop3.c:590
+#: pop3.c:598
msgid "Required APOP timestamp not found in greeting\n"
msgstr "No s'ha trobat la marca horària APOP requerida a la salutació\n"
-#: pop3.c:599
+#: pop3.c:607
msgid "Timestamp syntax error in greeting\n"
msgstr "Error de sintaxi en la marca horària de la salutació\n"
-#: pop3.c:621
+#: pop3.c:629
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Petició de protocol indefinida a POP3_auth\n"
-#: pop3.c:629
+#: pop3.c:637
msgid "lock busy! Is another session active?\n"
msgstr "bloqueig temporal! Hi ha alguna altra sessió activa?\n"
-#: pop3.c:708
+#: pop3.c:716
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "No s'ha pogut administrar la resposta UIDL del servidor remot.\n"
-#: pop3.c:731
+#: pop3.c:739
msgid "Server responded with UID for wrong message.\n"
msgstr "El servidor ha respost amb un UID pel missatge equivocat.\n"
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (núm=%d) s'ha esborrat, però encara està present!\n"
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
#, c-format
msgid "%u is unseen\n"
msgstr "%u és no llegit\n"
-#: pop3.c:864
+#: pop3.c:872
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"Els missatges estan inserits a la llista del servidor. No es pot continuar.\n"
-#: pop3.c:956
+#: pop3.c:964
msgid "protocol error\n"
msgstr "error de protocol\n"
-#: pop3.c:972
+#: pop3.c:980
msgid "protocol error while fetching UIDLs\n"
msgstr "error de protocol quan es rebien els UIDLs\n"
-#: pop3.c:1342
+#: pop3.c:1350
msgid "Option --folder is not supported with POP3\n"
msgstr "L'opció --folder no està suportada per POP3\n"
msgstr ""
"Project-Id-Version: fetchmail-6.2.6.alpha1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+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"
msgid "Fetchmail could not reach the mail server %s:"
msgstr "Fetchmail nemohl kontaktovat poštovní server %s:"
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
msgid "SSL connection failed.\n"
msgstr "Spojení SSL selhalo.\n"
msgid "will idle after poll\n"
msgstr "po stahování budu nečinný\n"
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "Spojení SSL selhalo.\n"
+
+#: imap.c:429 pop3.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
msgstr ""
-#: imap.c:540
+#: imap.c:547
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:562 pop3.c:372
+#: imap.c:569 pop3.c:373
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:571
+#: imap.c:578
msgid "Required LOGIN capability not supported by server\n"
msgstr "Server nepodporuje požadovanou schopnost LOGIN\n"
-#: imap.c:645
+#: imap.c:652
#, 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:749 imap.c:808
+#: imap.c:756 imap.c:815
msgid "re-poll failed\n"
msgstr "opakované stahování selhalo\n"
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\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:774
+#: imap.c:781
msgid "mailbox selection failed\n"
msgstr "výběr poštovní schránky selhal\n"
# c-format
-#: imap.c:778
+#: imap.c:785
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\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:792
+#: imap.c:799
msgid "expunge failed\n"
msgstr "čištění selhalo\n"
-#: imap.c:796
+#: imap.c:803
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\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:838
+#: imap.c:845
msgid "search for unseen messages failed\n"
msgstr "hledání nepřečtených zpráv selhalo\n"
-#: imap.c:866
+#: imap.c:873
#, fuzzy, c-format
msgid "%lu is unseen\n"
msgstr "%u nebyla přečtena\n"
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
#, c-format
msgid "%u is first unseen\n"
msgstr "%u je první nepřečtená\n"
-#: imap.c:969
+#: imap.c:976
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr "Nemohu dekódovat výzvu OTP\n"
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
msgid "Secret pass phrase: "
msgstr "Tajné heslo: "
msgstr ""
" --showdots zobrazovat tečky průběhu i v souborech se záznamy\n"
-#: pop3.c:342
+#: pop3.c:343
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr ""
-#: pop3.c:590
+#: pop3.c:598
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Požadovaný časový údaj APOP nebyl v pozdravu nalezen\n"
-#: pop3.c:599
+#: pop3.c:607
msgid "Timestamp syntax error in greeting\n"
msgstr "Syntaktická chyba v časovém údaji z pozdravu\n"
-#: pop3.c:621
+#: pop3.c:629
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Žádost o nedefinovaný protokol v POP3_auth\n"
-#: pop3.c:629
+#: pop3.c:637
msgid "lock busy! Is another session active?\n"
msgstr "zamčeno! Je aktivní jiné sezení?\n"
-#: pop3.c:708
+#: pop3.c:716
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr ""
-#: pop3.c:731
+#: pop3.c:739
msgid "Server responded with UID for wrong message.\n"
msgstr ""
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) bylo odstraněno, ale je stále přítomno!\n"
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
#, c-format
msgid "%u is unseen\n"
msgstr "%u nebyla přečtena\n"
-#: pop3.c:864
+#: pop3.c:872
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "Zprávy vloženy do seznamu na serveru. To neumím zpracovat.\n"
-#: pop3.c:956
+#: pop3.c:964
msgid "protocol error\n"
msgstr "chyba protokolu\n"
-#: pop3.c:972
+#: pop3.c:980
msgid "protocol error while fetching UIDLs\n"
msgstr "chyba protokolu při stahování UIDL\n"
-#: pop3.c:1342
+#: pop3.c:1350
#, fuzzy
msgid "Option --folder is not supported with POP3\n"
msgstr "Přepínač --remote není s POP3 podporován\n"
msgstr ""
"Project-Id-Version: fetchmail 6.3.4-rc2\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+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"
msgid "Fetchmail could not reach the mail server %s:"
msgstr "Fetchmail konnte keine Mail von %s erhalten:"
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
msgid "SSL connection failed.\n"
msgstr "SSL-Verbindung fehlgeschlagen.\n"
msgid "will idle after poll\n"
msgstr "werde nach Abfrage untätig sein\n"
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+msgid "TLS connection failed.\n"
+msgstr "TLS-Verbindung fehlgeschlagen.\n"
+
+#: imap.c:429 pop3.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
msgstr "%s: opportunistisches Upgrade auf TLS.\n"
-#: imap.c:540
+#: imap.c:547
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Benötigte OTP-Fähigkeit nicht in fetchmail einkompiliert\n"
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Benötigte NTLM-Fähigkeit nicht in fetchmail einkompiliert\n"
-#: imap.c:571
+#: imap.c:578
msgid "Required LOGIN capability not supported by server\n"
msgstr "Benötigte LOGIN-Fähigkeit nicht vom Server unterstützt\n"
-#: imap.c:645
+#: imap.c:652
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "unerwartete Expunge-Bestätigung (%d tatsächlich != %d erwartet)\n"
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
msgid "re-poll failed\n"
msgstr "erneute Abfrage fehlgeschlagen\n"
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
#, 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:774
+#: imap.c:781
msgid "mailbox selection failed\n"
msgstr "Postfach-Auswahl fehlgeschlagen\n"
-#: imap.c:778
+#: imap.c:785
#, 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:792
+#: imap.c:799
msgid "expunge failed\n"
msgstr "Säubern fehlgeschlagen\n"
-#: imap.c:796
+#: imap.c:803
#, 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:838
+#: imap.c:845
msgid "search for unseen messages failed\n"
msgstr "Suche nach ungesehenen Nachrichten fehlgeschlagen\n"
-#: imap.c:866
+#: imap.c:873
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu ist ungesehen\n"
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
#, c-format
msgid "%u is first unseen\n"
msgstr "%u ist erste ungesehene\n"
-#: imap.c:969
+#: imap.c:976
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr "Warnung: ignoriere falsche Größendaten vom Server.\n"
msgid "Could not decode OTP challenge\n"
msgstr "Konnte OTP-Herausforderung nicht dekodieren\n"
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
msgid "Secret pass phrase: "
msgstr "Geheime Passphrase: "
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots Fortschrittspunkte auch in Log-Dateien zeigen\n"
-#: pop3.c:342
+#: pop3.c:343
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
"Warnung: „Maillennium POP3/PROXY-Server” gefunden, benutze RETR-Befehl statt "
"TOP.\n"
-#: pop3.c:590
+#: pop3.c:598
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Erforderlicher APOP-Zeitstempel nicht in Begrüßung gefunden\n"
-#: pop3.c:599
+#: pop3.c:607
msgid "Timestamp syntax error in greeting\n"
msgstr "Zeitstempel-Syntax-Fehler in Begrüßung\n"
-#: pop3.c:621
+#: pop3.c:629
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Anfrage nach undefiniertem Protokoll in POP3_auth\n"
-#: pop3.c:629
+#: pop3.c:637
msgid "lock busy! Is another session active?\n"
msgstr "Lock beschäftigt! Ist eine weitere Sitzung aktiv?\n"
-#: pop3.c:708
+#: pop3.c:716
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "Kann die UIDL-Antwort des Servers nicht verarbeiten.\n"
-#: pop3.c:731
+#: pop3.c:739
msgid "Server responded with UID for wrong message.\n"
msgstr "Server hat mit UID der falschen Nachricht geantwortet.\n"
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) wurde gelöscht, ist aber immer noch da!\n"
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
#, c-format
msgid "%u is unseen\n"
msgstr "%u ist ungesehen\n"
-#: pop3.c:864
+#: pop3.c:872
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "Nachrichten in Liste auf Server eingefügt. Kann damit nicht umgehen.\n"
-#: pop3.c:956
+#: pop3.c:964
msgid "protocol error\n"
msgstr "Protokollfehler\n"
-#: pop3.c:972
+#: pop3.c:980
msgid "protocol error while fetching UIDLs\n"
msgstr "Protokollfehler beim Holen der UIDL\n"
-#: pop3.c:1342
+#: pop3.c:1350
msgid "Option --folder is not supported with POP3\n"
msgstr "Option --folder wird mit POP3 nicht unterstützt\n"
msgstr ""
"Project-Id-Version: fetchmail 6.3.4-rc1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+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"
msgid "Fetchmail could not reach the mail server %s:"
msgstr "Fetchmail no puede alcanzar al servidor de correo %s:"
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
msgid "SSL connection failed.\n"
msgstr "Fallo en la conexión SSL.\n"
msgid "will idle after poll\n"
msgstr "descansará después de inquirir\n"
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "Fallo en la conexión SSL.\n"
+
+#: imap.c:429 pop3.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
msgstr "%s: actualización oportunista a TLS.\n"
-#: imap.c:540
+#: imap.c:547
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "La capacidad OTP requerida no fue compilada en fetchmail\n"
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "La capacidad NTLM requerida no fue compilada en fetchmail\n"
-#: imap.c:571
+#: imap.c:578
msgid "Required LOGIN capability not supported by server\n"
msgstr "La capacidad LOGIN requerida no es soportada por el servidor\n"
-#: imap.c:645
+#: imap.c:652
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "inconsistencia en borrado de mensajes (%d actual != %d esperado)\n"
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
msgid "re-poll failed\n"
msgstr "falló el reintento de consulta\n"
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
#, 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:774
+#: imap.c:781
msgid "mailbox selection failed\n"
msgstr "falló la selección de casilla\n"
-#: imap.c:778
+#: imap.c:785
#, 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:792
+#: imap.c:799
msgid "expunge failed\n"
msgstr "falló la eliminación\n"
-#: imap.c:796
+#: imap.c:803
#, 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:838
+#: imap.c:845
msgid "search for unseen messages failed\n"
msgstr "la búsqueda de mensajes no visto falló\n"
-#: imap.c:866
+#: imap.c:873
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu no fue visto\n"
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
#, c-format
msgid "%u is first unseen\n"
msgstr "%u es el primero que no fue visto\n"
-#: imap.c:969
+#: imap.c:976
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr "No fue posible decodificar el desafío OTP\n"
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
msgid "Secret pass phrase: "
msgstr "Frase clave secreta: "
" --showdots mostrar puntos de progreso incluso en los archivos de "
"registro\n"
-#: pop3.c:342
+#: pop3.c:343
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
"Aviso: encontrado \"Maillennium POP3/PROXY server\", usando el comando RETR "
"en lugar de TOP.\n"
-#: pop3.c:590
+#: pop3.c:598
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Estampa de tiempo APOP requerida no encontrada en el saludo\n"
-#: pop3.c:599
+#: pop3.c:607
msgid "Timestamp syntax error in greeting\n"
msgstr "Error de sintaxis en la estampa de tiempo en el saludo\n"
-#: pop3.c:621
+#: pop3.c:629
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Pedido de protocolo indefinido en POP3_auth\n"
-#: pop3.c:629
+#: pop3.c:637
msgid "lock busy! Is another session active?\n"
msgstr "¡bloqueo ocupado! ¿Hay otra sesión activa?\n"
-#: pop3.c:708
+#: pop3.c:716
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "No se puede manejar la respuesta UIDL proveniente del servidor.\n"
-#: pop3.c:731
+#: pop3.c:739
msgid "Server responded with UID for wrong message.\n"
msgstr "El servidor devolvió el UID de un mensaje incorrecto.\n"
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n"
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
#, c-format
msgid "%u is unseen\n"
msgstr "%u no fue visto\n"
-#: pop3.c:864
+#: pop3.c:872
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"Mensajes insertados en una lista en el servidor. No se puede manejar esto.\n"
-#: pop3.c:956
+#: pop3.c:964
msgid "protocol error\n"
msgstr "error de protocolo\n"
-#: pop3.c:972
+#: pop3.c:980
msgid "protocol error while fetching UIDLs\n"
msgstr "error de protocolo durante la recepción de UIDLs\n"
-#: pop3.c:1342
+#: pop3.c:1350
msgid "Option --folder is not supported with POP3\n"
msgstr "La opción --folder no está soportada con POP3\n"
msgstr ""
"Project-Id-Version: fetchmail 6.2.9-rc9\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+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"
msgid "Fetchmail could not reach the mail server %s:"
msgstr "Fetchmail n'a pas pu recevoir le courrier de %s:"
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
msgid "SSL connection failed.\n"
msgstr "Échec de la connexion SSL\n"
msgid "will idle after poll\n"
msgstr "attendra après la réception\n"
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+msgid "TLS connection failed.\n"
+msgstr "Échec de la connexion TLS.\n"
+
+#: imap.c:429 pop3.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
msgstr ""
-#: imap.c:540
+#: imap.c:547
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "La fonctionnalité OTP requise n'est pas supportée par fetchmail\n"
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "La fonctionnalité NTLM requise n'est pas supportée par fetchmail.\n"
-#: imap.c:571
+#: imap.c:578
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:645
+#: imap.c:652
#, 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:749 imap.c:808
+#: imap.c:756 imap.c:815
msgid "re-poll failed\n"
msgstr "échec durant la re-réception\n"
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
#, 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:774
+#: imap.c:781
msgid "mailbox selection failed\n"
msgstr "échec de la sélection de boîte aux lettres\n"
-#: imap.c:778
+#: imap.c:785
#, 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:792
+#: imap.c:799
msgid "expunge failed\n"
msgstr "échec de la purge\n"
-#: imap.c:796
+#: imap.c:803
#, 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:838
+#: imap.c:845
msgid "search for unseen messages failed\n"
msgstr "échec de la recherche des messages non-vus\n"
-#: imap.c:866
+#: imap.c:873
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu n'est pas vu\n"
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
#, c-format
msgid "%u is first unseen\n"
msgstr "%u est le premier a n'avoir pas été vu\n"
-#: imap.c:969
+#: imap.c:976
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr "Impossible de décoder le challenge OTP\n"
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
msgid "Secret pass phrase: "
msgstr "Phrase de passe secrète : "
msgstr ""
" --showdots affiche des points de progression, même dans le journal\n"
-#: pop3.c:342
+#: pop3.c:343
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
"Avertissement: trouvé «Maillennium POP3/PROXY server», la commande RETR est "
"utilisé au lieu de TOP.\n"
-#: pop3.c:590
+#: pop3.c:598
msgid "Required APOP timestamp not found in greeting\n"
msgstr "L'horodatage APOP requis est absent du message d'invitation\n"
-#: pop3.c:599
+#: pop3.c:607
msgid "Timestamp syntax error in greeting\n"
msgstr "Erreur de syntaxe dans l'horodatage du message d'invitation\n"
-#: pop3.c:621
+#: pop3.c:629
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Requête de protocole indéfinie dans POP3_auth\n"
-#: pop3.c:629
+#: pop3.c:637
msgid "lock busy! Is another session active?\n"
msgstr "Fichier verrou en service. Y'a-t-il une autre session active ?\n"
-#: pop3.c:708
+#: pop3.c:716
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "Ne peux pas manier la réponse UIDL du serveur.\n"
-#: pop3.c:731
+#: pop3.c:739
msgid "Server responded with UID for wrong message.\n"
msgstr "Serveur répondait avec UID d'un faux message.\n"
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) a été effacé, mais est toujours présent !\n"
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
#, c-format
msgid "%u is unseen\n"
msgstr "%u n'est pas vu\n"
-#: pop3.c:864
+#: pop3.c:872
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "Messages insérés dans une liste du serveur. Impossible de gérer ça.\n"
-#: pop3.c:956
+#: pop3.c:964
msgid "protocol error\n"
msgstr "erreur de protocole\n"
-#: pop3.c:972
+#: pop3.c:980
msgid "protocol error while fetching UIDLs\n"
msgstr "erreur de protocole durant la réception des UIDLs\n"
-#: pop3.c:1342
+#: pop3.c:1350
msgid "Option --folder is not supported with POP3\n"
msgstr "L'option --folder n'est pas supportée avec POP3\n"
msgstr ""
"Project-Id-Version: fetchmail 6.3.5-b3\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
"PO-Revision-Date: 2006-09-29 07:29+0900\n"
"Last-Translator: Takeshi Hamasaki <hma@syd.odn.ne.jp>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
msgid "Fetchmail could not reach the mail server %s:"
msgstr "Fetchmail 実行中にメールサーバ %s と交信できませんでした:"
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
msgid "SSL connection failed.\n"
msgstr "SSL による接続に失敗しました。\n"
msgid "will idle after poll\n"
msgstr "接続の後、休止します。\n"
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "SSL による接続に失敗しました。\n"
+
+#: imap.c:429 pop3.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
msgstr "%s: TLS へのアップグレードに適合。\n"
-#: imap.c:540
+#: imap.c:547
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr ""
"OTP が要求されましたが、fetchmail が OTP 対応でコンパイルされていません。\n"
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "要求された NTLM 処理能力は fetchmail に組み込まれていません。\n"
-#: imap.c:571
+#: imap.c:578
msgid "Required LOGIN capability not supported by server\n"
msgstr "要求された LOGIN 処理能力はサーバでサポートされていません。\n"
-#: imap.c:645
+#: imap.c:652
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "メッセージの大きさが合いません (%d (実際) != %d (予想)) \n"
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
msgid "re-poll failed\n"
msgstr "再アクセスに失敗しました。\n"
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
#, 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:774
+#: imap.c:781
msgid "mailbox selection failed\n"
msgstr "メールボックスの選択に失敗しました\n"
-#: imap.c:778
+#: imap.c:785
#, 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:792
+#: imap.c:799
msgid "expunge failed\n"
msgstr "削除に失敗しました。\n"
-#: imap.c:796
+#: imap.c:803
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "削除の後、%d 通のメッセージが残っています。\n"
-#: imap.c:838
+#: imap.c:845
msgid "search for unseen messages failed\n"
msgstr "未読メッセージの検索に失敗しました。\n"
-#: imap.c:866
+#: imap.c:873
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu は未読です。\n"
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
#, c-format
msgid "%u is first unseen\n"
msgstr "%u は最初の未読メッセージです。\n"
-#: imap.c:969
+#: imap.c:976
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr "OTP challenge のデコードが出来ませんでした。\n"
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
msgid "Secret pass phrase: "
msgstr "Secret pass phrase: "
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots ログファイルにも進行状況を示す . を書き込みます\n"
-#: pop3.c:342
+#: pop3.c:343
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
"警告: Maillennium POP3/プロクシサーバです。TOP の代わりに RETR コマンドを使用"
"します。\n"
-#: pop3.c:590
+#: pop3.c:598
msgid "Required APOP timestamp not found in greeting\n"
msgstr "greeting 中に APOP timestamp が存在しません。\n"
-#: pop3.c:599
+#: pop3.c:607
msgid "Timestamp syntax error in greeting\n"
msgstr "greeting 中の timestamp が不正です。\n"
-#: pop3.c:621
+#: pop3.c:629
msgid "Undefined protocol request in POP3_auth\n"
msgstr "POP3_auth 中で定義されていないプロトコルが要求されました。\n"
-#: pop3.c:629
+#: pop3.c:637
msgid "lock busy! Is another session active?\n"
msgstr "lock busy 状態です。別の交信が行われていないか確認して下さい。\n"
-#: pop3.c:708
+#: pop3.c:716
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "上流サーバからの UIDL 応答に対応できません。\n"
-#: pop3.c:731
+#: pop3.c:739
msgid "Server responded with UID for wrong message.\n"
msgstr "サーバが誤ったメッセージの UID に応答しました。\n"
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) は削除されましたが、まだ存在しています!\n"
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
#, c-format
msgid "%u is unseen\n"
msgstr "%u は未読です。\n"
-#: pop3.c:864
+#: pop3.c:872
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"サーバリストにメッセージが挿入されています。取り扱うことができません。\n"
-#: pop3.c:956
+#: pop3.c:964
msgid "protocol error\n"
msgstr "プロトコルエラーです。\n"
-#: pop3.c:972
+#: pop3.c:980
msgid "protocol error while fetching UIDLs\n"
msgstr "UIDL を取り込み中にプロトコルエラーが発生しました。\n"
-#: pop3.c:1342
+#: pop3.c:1350
msgid "Option --folder is not supported with POP3\n"
msgstr "POP3 では --folder オプションは利用できません。\n"
msgstr ""
"Project-Id-Version: fetchmail 6.3.5-b3\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
"PO-Revision-Date: 2006-10-02 07:40+0200\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
msgid "Fetchmail could not reach the mail server %s:"
msgstr "Fetchmail nie móg³ po³±czyæ siê z serwerem poczty %s:"
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
msgid "SSL connection failed.\n"
msgstr "po³±czenie SSL nie powiod³o siê.\n"
msgid "will idle after poll\n"
msgstr "przejdzie w stan bezczynno¶ci po odpytaniu\n"
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "po³±czenie SSL nie powiod³o siê.\n"
+
+#: imap.c:429 pop3.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
msgstr "%s: zgodne przej¶cie na TLS.\n"
-#: imap.c:540
+#: imap.c:547
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Wymagana metoda uwierzytelnienia OTP nie wkompilowana w fetchmaila\n"
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Wymagana metoda uwierzytelnienia NTLM nie wkompilowana w fetchmaila\n"
-#: imap.c:571
+#: imap.c:578
msgid "Required LOGIN capability not supported by server\n"
msgstr "Serwer nie obs³uguje wymaganej metody uwierzytelnienia LOGIN\n"
-#: imap.c:645
+#: imap.c:652
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "niezgodno¶æ przy usuwaniu poczty (faktyczna %d != oczekiwana %d)\n"
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
msgid "re-poll failed\n"
msgstr "ponowne po³±czenie nie powiod³o siê\n"
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[1] "%d listy oczekuj±ce po ponownym pobraniu\n"
msgstr[2] "%d listów oczekuj±cych po ponownym pobraniu\n"
-#: imap.c:774
+#: imap.c:781
msgid "mailbox selection failed\n"
msgstr "wybór skrzynki zakoñczy³ siê niepowodzeniem\n"
-#: imap.c:778
+#: imap.c:785
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[1] "%d listy oczekuj±ce po pierwszym pobraniu\n"
msgstr[2] "%d listów oczekuj±cych po pierwszym pobraniu\n"
-#: imap.c:792
+#: imap.c:799
msgid "expunge failed\n"
msgstr "usuwanie nie powiod³o siê\n"
-#: imap.c:796
+#: imap.c:803
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[1] "%d listy oczekuj±ce po usuwaniu\n"
msgstr[2] "%d listów oczekuj±cych po usuwaniu\n"
-#: imap.c:838
+#: imap.c:845
msgid "search for unseen messages failed\n"
msgstr "poszukiwanie nieprzeczytanych listów nie powiod³o siê\n"
-#: imap.c:866
+#: imap.c:873
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu jest nieprzeczytany\n"
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
#, c-format
msgid "%u is first unseen\n"
msgstr "%u jest pierwszym nieprzeczytanym\n"
-#: imap.c:969
+#: imap.c:976
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr "Rozkodowanie wyzwania OTP by³o niemo¿liwe\n"
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
msgid "Secret pass phrase: "
msgstr "Tajne has³o: "
msgstr ""
" --showdots pokazuje kropki oznaczaj±ce postêp tak¿e w logach\n"
-#: pop3.c:342
+#: pop3.c:343
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
"Uwaga: Odkryto serwer \"POP3/PROXY Maillennium\", u¿ycie polecenia RETR "
"zamiast TOP.\n"
-#: pop3.c:590
+#: pop3.c:598
msgid "Required APOP timestamp not found in greeting\n"
msgstr "W powitaniu serwera brakuje wymaganego znacznika czasu APOP\n"
-#: pop3.c:599
+#: pop3.c:607
msgid "Timestamp syntax error in greeting\n"
msgstr "B³±d sk³adni znacznika czasu w powitaniu\n"
-#: pop3.c:621
+#: pop3.c:629
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Pro¶ba o nieznany protokó³ w POP3_auth\n"
-#: pop3.c:629
+#: pop3.c:637
msgid "lock busy! Is another session active?\n"
msgstr "plik zablokowany! Czy inna sesja nie jest aktywna?\n"
-#: pop3.c:708
+#: pop3.c:716
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "Nie mo¿na obs³u¿yæ odpowiedzi UIDL od serwera.\n"
-#: pop3.c:731
+#: pop3.c:739
msgid "Server responded with UID for wrong message.\n"
msgstr "Serwer odpowiedzia³ z UID-em dla niew³a¶ciwego listu.\n"
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) zosta³ skasowany, ale nadal istnieje!\n"
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
#, c-format
msgid "%u is unseen\n"
msgstr "%u jest nieprzeczytany\n"
-#: pop3.c:864
+#: pop3.c:872
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"Przesy³ki zosta³y dodane do listy na serwerze. Nie mogê tego obs³u¿yæ.\n"
-#: pop3.c:956
+#: pop3.c:964
msgid "protocol error\n"
msgstr "b³±d protoko³u\n"
-#: pop3.c:972
+#: pop3.c:980
msgid "protocol error while fetching UIDLs\n"
msgstr "b³±d protoko³u podczas pobierania UIDL\n"
-#: pop3.c:1342
+#: pop3.c:1350
msgid "Option --folder is not supported with POP3\n"
msgstr "Opcja --folder nie dzia³a z POP3\n"
msgstr ""
"Project-Id-Version: fetchmail 6.3.5-b3\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
"PO-Revision-Date: 2006-09-29 15:51+0300\n"
"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
"Language-Team: Russian <ru@li.org>\n"
msgid "Fetchmail could not reach the mail server %s:"
msgstr "Fetchmail ÎÅ ÓÍÏÇ ÕÓÔÁÎÏ×ÉÔØ Ó×ÑÚØ Ó ÐÏÞÔÏ×ÙÍ ÓÅÒ×ÅÒÏÍ %s:"
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
msgid "SSL connection failed.\n"
msgstr "ðÏÄËÌÀÞÅÎÉÅ ÞÅÒÅÚ SSL ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ.\n"
msgid "will idle after poll\n"
msgstr "ÂÕÄÅÔ ÐÒÉÏÓÔÁÎÏ×ÌÅÎ ÐÏÓÌÅ ÏÐÒÏÓÁ\n"
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "ðÏÄËÌÀÞÅÎÉÅ ÞÅÒÅÚ SSL ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ.\n"
+
+#: imap.c:429 pop3.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
msgstr "%s: ÏÂÎÏ×ÌÅÎÉÅ ÄÏ TLS.\n"
-#: imap.c:540
+#: imap.c:547
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Fetchmail ÓËÏÍÐÉÌÉÒÏ×ÁÎ ÂÅÚ ÔÒÅÂÕÅÍÏÊ ÐÏÄÄÅÒÖËÉ OTP\n"
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Fetchmail ÓËÏÍÐÉÌÉÒÏ×ÁÎ ÂÅÚ ÔÒÅÂÕÅÍÏÊ ÐÏÄÄÅÒÖËÉ NTLM\n"
-#: imap.c:571
+#: imap.c:578
msgid "Required LOGIN capability not supported by server\n"
msgstr "ôÒÅÂÕÅÍÁÑ ÏÐÃÉÑ LOGIN ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÓÅÒ×ÅÒÏÍ\n"
-#: imap.c:645
+#: imap.c:652
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "ÒÁÚÎÏÇÌÁÓÉÅ ÐÒÉ ÕÄÁÌÅÎÉÉ ÐÉÓÅÍ (%d ÎÁ ÓÁÍÏÍ ÄÅÌÅ != %d ÏÖÉÄÁÌÏÓØ)\n"
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
msgid "re-poll failed\n"
msgstr "ÐÏ×ÔÏÒÎÙÊ ÏÐÒÏÓ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ\n"
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
#, 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:774
+#: imap.c:781
msgid "mailbox selection failed\n"
msgstr "×ÙÂÏÒ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ\n"
-#: imap.c:778
+#: imap.c:785
#, 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:792
+#: imap.c:799
msgid "expunge failed\n"
msgstr "ÕÄÁÌÅÎÉÅ ÚÁ×ÅÒÛÉÌÏÓØ ÎÅÕÄÁÞÅÊ\n"
-#: imap.c:796
+#: imap.c:803
#, 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:838
+#: imap.c:845
msgid "search for unseen messages failed\n"
msgstr "ÐÏÉÓË ÎÅ ÐÒÏÓÍÏÔÒÅÎÎÙÈ ÓÏÏÂÝÅÎÉÊ ÚÁ×ÅÒÛÉÌÓÑ ÎÅÕÄÁÞÅÊ\n"
-#: imap.c:866
+#: imap.c:873
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu ÎÅ ÐÒÏÓÍÏÔÒÅÎÏ\n"
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
#, c-format
msgid "%u is first unseen\n"
msgstr "%u ÐÅÒ×ÏÅ ÎÅ ÐÒÏÓÍÏÔÒÅÎÎÏÅ\n"
-#: imap.c:969
+#: imap.c:976
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÂÙÌÏ ÄÅËÏÄÉÒÏ×ÁÔØ ÚÁÐÒÏÓ OTP\n"
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
msgid "Secret pass phrase: "
msgstr "óÅËÒÅÔÎÁÑ ÉÄÅÎÔÉÆÉËÁÃÉÏÎÎÁÑ ÆÒÁÚÁ:"
msgstr ""
" --showdots ÏÔÏÂÒÁÖÅÎÉÅ ÔÏÞÅÞÎÏÊ ÓÔÒÏËÉ ÐÒÏÇÒÅÓÓÁ ÄÁÖÅ × log-ÆÁÊÌÁÈ\n"
-#: pop3.c:342
+#: pop3.c:343
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÁÊÄÅÎ POP3/PROXY-ÓÅÒ×ÅÒ Maillennium; ×ÍÅÓÔÏ TOP "
"ÉÓÐÏÌØÚÕÅÔÓÑ ËÏÍÁÎÄÁ RETR.\n"
-#: pop3.c:590
+#: pop3.c:598
msgid "Required APOP timestamp not found in greeting\n"
msgstr "÷ ÐÒÉ×ÅÔÓÔ×ÉÉ ÎÅ ÎÁÊÄÅÎÁ ÔÒÅÂÕÅÍÁÑ ×ÒÅÍÅÎÎÁÑ ÍÅÔËÁ APOP\n"
-#: pop3.c:599
+#: pop3.c:607
msgid "Timestamp syntax error in greeting\n"
msgstr "÷ ÐÒÉ×ÅÔÓÔ×ÉÉ ÏÛÉÂËÁ ÓÉÎÔÁËÓÉÓÁ ×ÒÅÍÅÎÎÏÊ ÍÅÔËÉ\n"
-#: pop3.c:621
+#: pop3.c:629
msgid "Undefined protocol request in POP3_auth\n"
msgstr "îÅÏÐÒÅÄÅÌÅÎÎÙÊ ÚÁÐÒÏÓ ÐÒÏÔÏËÏÌÁ × POP3_auth\n"
-#: pop3.c:629
+#: pop3.c:637
msgid "lock busy! Is another session active?\n"
msgstr "ÂÌÏËÉÒÏ×ËÁ ÚÁÎÑÔÏÓÔÉ! íÏÖÅÔ ÁËÔÉ×ÅÎ ÄÒÕÇÏÊ ÓÅÁÎÓ?\n"
-#: pop3.c:708
+#: pop3.c:716
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÂÒÁÂÏÔÁÔØ UIDL-ÏÔ×ÅÔ upstream-ÓÅÒ×ÅÒÁ.\n"
-#: pop3.c:731
+#: pop3.c:739
msgid "Server responded with UID for wrong message.\n"
msgstr "óÅÒ×ÅÒ ×ÏÚ×ÒÁÔÉÌ ÏÔ×ÅÔ Ó UID ÄÌÑ ÎÅ×ÅÒÎÏÇÏ ÓÏÏÂÝÅÎÉÑ.\n"
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (ÎÏÍÅÒ=%d) ÂÙÌÏ ÕÄÁÌÅÎÏ, ÎÏ ×ÓÅ ÅÝÅ ÐÒÉÓÕÔÓÔ×ÕÅÔ!\n"
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
#, c-format
msgid "%u is unseen\n"
msgstr "%u ÎÅ ÐÒÏÓÍÏÔÒÅÎÏ\n"
-#: pop3.c:864
+#: pop3.c:872
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "óÏÏÂÝÅÎÉÑ ÄÏÂÁ×ÌÅÎÙ × ÓÐÉÓÏË ÎÁ ÓÅÒ×ÅÒÅ. ïÂÒÁÂÏÔËÁ ÎÅ×ÏÚÍÏÖÎÁ.\n"
-#: pop3.c:956
+#: pop3.c:964
msgid "protocol error\n"
msgstr "ÏÛÉÂËÁ ÐÒÏÔÏËÏÌÁ\n"
-#: pop3.c:972
+#: pop3.c:980
msgid "protocol error while fetching UIDLs\n"
msgstr "ÏÛÉÂËÁ ÐÒÏÔÏËÏÌÁ ÐÒÉ ×ÙÂÏÒËÅ UIDL'Ï×\n"
-#: pop3.c:1342
+#: pop3.c:1350
msgid "Option --folder is not supported with POP3\n"
msgstr "ïÐÃÉÑ --folder ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ Ó POP3\n"
msgstr ""
"Project-Id-Version: fetchmail 6.2.9-rc9\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+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"
msgid "Fetchmail could not reach the mail server %s:"
msgstr "Fetchmail-i nuk mundi të lidhet me shërbyesin e postës %s:"
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
msgid "SSL connection failed.\n"
msgstr "Lidhja SSL dështoi.\n"
msgid "will idle after poll\n"
msgstr "do të rrijë bosh pas vjeljeje\n"
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "Lidhja SSL dështoi.\n"
+
+#: imap.c:429 pop3.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
msgstr ""
-#: imap.c:540
+#: imap.c:547
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Aftësi e nevojshme OTP e papërpiluar tek fetchmail-i\n"
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Aftësi e nevojshme NTML e papërpiluar tek fetchmail-i\n"
-#: imap.c:571
+#: imap.c:578
msgid "Required LOGIN capability not supported by server\n"
msgstr "Aftësi e nevojshme LOGIN e pambuluar prej shërbyesit\n"
-#: imap.c:645
+#: imap.c:652
#, fuzzy, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr ""
"mesazhi %s@%s:%d nuk pat gjatësinë e pritur (%d aktualja != %d e pritshmja)\n"
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
msgid "re-poll failed\n"
msgstr "rivjelja dështoi\n"
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
#, 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:774
+#: imap.c:781
msgid "mailbox selection failed\n"
msgstr "përzgjedhja e kutisë postare dështoi\n"
-#: imap.c:778
+#: imap.c:785
#, 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:792
+#: imap.c:799
msgid "expunge failed\n"
msgstr "shuarja dështoi\n"
-#: imap.c:796
+#: imap.c:803
#, 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:838
+#: imap.c:845
msgid "search for unseen messages failed\n"
msgstr "kërkimi për mesazhe të pavërejtur dështoi\n"
-#: imap.c:866
+#: imap.c:873
#, fuzzy, c-format
msgid "%lu is unseen\n"
msgstr "%u është i pavërejtur\n"
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
#, c-format
msgid "%u is first unseen\n"
msgstr "%u është i pari i pavërejtur\n"
-#: imap.c:969
+#: imap.c:976
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr ""
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
msgid "Secret pass phrase: "
msgstr "Frazë pass sekrete: "
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots shfaq pika përparimi edhe në kartela regjistrimi\n"
-#: pop3.c:342
+#: pop3.c:343
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr ""
-#: pop3.c:590
+#: pop3.c:598
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Nuk u gjet vulë kohore e nevojshme APOP në përshëndetje\n"
-#: pop3.c:599
+#: pop3.c:607
msgid "Timestamp syntax error in greeting\n"
msgstr "Gabim sintakse vule kohore në përshëndetje\n"
-#: pop3.c:621
+#: pop3.c:629
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Kërkesë protokolli e papërcaktuar në POP3_auth\n"
-#: pop3.c:629
+#: pop3.c:637
msgid "lock busy! Is another session active?\n"
msgstr ""
-#: pop3.c:708
+#: pop3.c:716
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr ""
-#: pop3.c:731
+#: pop3.c:739
msgid "Server responded with UID for wrong message.\n"
msgstr "Shërbyesi u përgjigj me UID për mesazh të gabuar.\n"
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
#, fuzzy, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) qe fshirë, por është ende i pranishëm!\n"
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
#, c-format
msgid "%u is unseen\n"
msgstr "%u është i pavërejtur\n"
-#: pop3.c:864
+#: pop3.c:872
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"Mesazhe të futur në një listë te shërbyesi. Nuk mund ta bëj dot këtë.\n"
-#: pop3.c:956
+#: pop3.c:964
msgid "protocol error\n"
msgstr "gabim protokolli\n"
-#: pop3.c:972
+#: pop3.c:980
msgid "protocol error while fetching UIDLs\n"
msgstr "gabim protokolli gjatë sjelljes së UIDL-ve\n"
-#: pop3.c:1342
+#: pop3.c:1350
msgid "Option --folder is not supported with POP3\n"
msgstr "Mundësia --dosje nuk mbulohet me POP3\n"
msgstr ""
"Project-Id-Version: fetchmail 6.3.5-b3\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
"PO-Revision-Date: 2006-09-30 22:55+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
msgid "Fetchmail could not reach the mail server %s:"
msgstr "Fetchmail không thể tới máy phục vụ thư %s:"
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
msgid "SSL connection failed.\n"
msgstr "Kết nối SSL đã thất bại.\n"
msgid "will idle after poll\n"
msgstr "sẽ nghỉ sau khi thăm dò\n"
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "Kết nối SSL đã thất bại.\n"
+
+#: imap.c:429 pop3.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
msgstr "%s: nâng cấp lên TLS một cách cơ hội chủ nghĩa.\n"
-#: imap.c:540
+#: imap.c:547
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:562 pop3.c:372
+#: imap.c:569 pop3.c:373
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:571
+#: imap.c:578
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:645
+#: imap.c:652
#, 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:749 imap.c:808
+#: imap.c:756 imap.c:815
msgid "re-poll failed\n"
msgstr "việc thăm dò lại bị lỗi\n"
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
#, 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:774
+#: imap.c:781
msgid "mailbox selection failed\n"
msgstr "việc chọn hộp thư bị lỗi\n"
-#: imap.c:778
+#: imap.c:785
#, 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:792
+#: imap.c:799
msgid "expunge failed\n"
msgstr "việc xoá hẳn bị lỗi\n"
-#: imap.c:796
+#: imap.c:803
#, 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:838
+#: imap.c:845
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:866
+#: imap.c:873
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu chưa xem\n"
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
#, c-format
msgid "%u is first unseen\n"
msgstr "%u là thư đầu chưa xem\n"
-#: imap.c:969
+#: imap.c:976
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr "Không thể giải mã yêu cầu OTP\n"
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
msgid "Secret pass phrase: "
msgstr "Cụm từ mật khẩu bí mật: "
msgstr ""
" --showdots _hiện các chấm_ tiến hành ngay cả trong tập tin ghi lưu\n"
-#: pop3.c:342
+#: pop3.c:343
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
"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:590
+#: pop3.c:598
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Không tìm thấy nhãn thời gian APOP cần thiết trong lời chào mừng\n"
-#: pop3.c:599
+#: pop3.c:607
msgid "Timestamp syntax error in greeting\n"
msgstr "Gặp lỗi cú pháp nhãn thời gian trong lời chào mừng\n"
-#: pop3.c:621
+#: pop3.c:629
msgid "Undefined protocol request in POP3_auth\n"
msgstr ""
"Gặp yêu cầu giao thức không được xác định trong « POP3_auth » (xác thực)\n"
-#: pop3.c:629
+#: pop3.c:637
msgid "lock busy! Is another session active?\n"
msgstr "khoá bận ! Có phiên chạy khác hoạt động không?\n"
-#: pop3.c:708
+#: pop3.c:716
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "Không thể xử lý đáp ứng UIDL từ máy phục vụ nguồn.\n"
-#: pop3.c:731
+#: pop3.c:739
msgid "Server responded with UID for wrong message.\n"
msgstr "Máy phục vụ đã đáp ứng UID cho thư không đúng.\n"
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (số=%d) đã được xoá bỏ, nhưng còn có.\n"
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
#, c-format
msgid "%u is unseen\n"
msgstr "%u chưa xem\n"
-#: pop3.c:864
+#: pop3.c:872
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"Gặp thư được chèn vào danh sách trên máy phục vụ. Không thể xử lý trường hợp "
"này.\n"
-#: pop3.c:956
+#: pop3.c:964
msgid "protocol error\n"
msgstr "lỗi giao thức\n"
-#: pop3.c:972
+#: pop3.c:980
msgid "protocol error while fetching UIDLs\n"
msgstr "gặp lỗi giao thức khi lấy các UIDL\n"
-#: pop3.c:1342
+#: pop3.c:1350
msgid "Option --folder is not supported with POP3\n"
msgstr "Không hỗ trợ tùy chọn « --folder » (thư mục) với POP3\n"
#endif
#include "fetchmail.h"
#include "socket.h"
+#include "i18n.h"
static int pound_arg, equal_arg;
int status;
(void)buf;
+ if (ctl->sslproto && !strcasecmp(ctl->sslproto, "tls1") && !ctl->use_ssl)
+ {
+ report(stderr, GT_("POP2 does not support STARTTLS. Giving up.\n"));
+ return PS_SOCKET;
+ }
strlcpy(shroud, ctl->password, sizeof(shroud));
status = gen_transact(sock,
"HELO %s %s",
#endif /* OPIE_ENABLE */
#ifdef SSL_ENABLE
flag did_stls = FALSE;
+ flag using_tls = FALSE;
#endif /* SSL_ENABLE */
#if defined(GSSAPI)
(ok == PS_SOCKET && !ctl->wehaveauthed))
{
ctl->server.authenticate = A_PASSWORD;
- /* repoll immediately */
+ /* repoll immediately with PASS authentication */
ok = PS_REPOLL;
break;
}
return PS_REPOLL;
}
report(stderr,
- GT_("SSL connection failed.\n"));
+ GT_("TLS connection failed.\n"));
return PS_SOCKET;
} else {
if (outlevel >= O_VERBOSE && !ctl->sslproto)
report(stdout, GT_("%s: opportunistic upgrade to TLS.\n"), realhost);
+ using_tls = TRUE;
}
did_stls = TRUE;
*/
capa_probe(sock);
}
+ if ((ctl->sslproto && !strcasecmp(ctl->sslproto,"tls1")) && !ctl->use_ssl && !using_tls) {
+ report(stderr,
+ GT_("TLS connection failed.\n"));
+ return PS_SOCKET;
+ }
+
#endif /* SSL_ENABLE */
/*
if (did_stls && ok == PS_SOCKET && !ctl->sslproto && !ctl->wehaveauthed)
{
ctl->sslproto = xstrdup("");
- /* repoll immediately */
+ /* repoll immediately without TLS */
ok = PS_REPOLL;
}
#endif
projects / ~andy / fetchmail / commitdiff