From 3b7fb7e8a39146c504cbc196eaf80507996ad7b8 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Sun, 25 Sep 2005 22:47:33 +0000
Subject: Snapshot 6.2.9-rc5.

svn path=/trunk/; revision=4337
---
 TODO     |   4 -
 po/ca.po | 281 ++++++++++++++++++++++++++++++++++-----------------------------
 po/cs.po | 272 ++++++++++++++++++++++++++++++++-----------------------------
 po/es.po | 272 ++++++++++++++++++++++++++++++++-----------------------------
 po/pl.po | 279 +++++++++++++++++++++++++++++++++-----------------------------
 po/ru.po | 279 +++++++++++++++++++++++++++++++++-----------------------------
 6 files changed, 741 insertions(+), 646 deletions(-)

diff --git a/TODO b/TODO
index fbb72d21..2997c971 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-Review Solaris gettext stuff.
-
 RFC2047 encode X-Fetchmail-Warning?
 X-Fetchmail-Warning: Empfängeradresse root@example.org stimmt mit keinem lokalen Namen überein
 X-Virus-Scanned: amavisd-new at m2a2.dyndns.org
@@ -12,5 +10,3 @@ complete CAN_MONITOR replacement
 put all getaddrinfo compat cruft into an easy-to-use m4 macro for
 autoconf and Makefile.am snippet for automake, so people can just use it
 without further hassle.
-
-pkg-config for OpenSSL? -ldl problem
diff --git a/po/ca.po b/po/ca.po
index 16d9d13a..3b12e1f3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-09-21 10:45+0200\n"
+"POT-Creation-Date: 2005-09-25 13:01+0200\n"
 "PO-Revision-Date: 2005-09-19 21:24+0200\n"
 "Last-Translator: Ernest Adrogu� Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -378,7 +378,7 @@ msgstr "seleccionant o re-examinant la carpeta per omissi
 msgid "%s at %s (folder %s)"
 msgstr "%s a %s (carpeta %s)"
 
-#: driver.c:1314 rcfile_y.y:374
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
@@ -882,14 +882,16 @@ msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "atenci�: No demaneu ajuda si tot el correu va al postmaster!\n"
 
 #: fetchmail.c:1185
-#, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr ""
 "la configuraci� de %s no �s v�lida, el port no pot ser n�mero negatiu\n"
 
 #: fetchmail.c:1192
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "la configuraci� de %s no �s v�lida, RPOP requereix un port privilegiat\n"
 
@@ -1447,14 +1449,9 @@ msgstr "  L'encaminament per l'adre
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  S'assumeix que la cap�alera de l'embolcall �s: %s\n"
 
-# nom de la cap�alera
-#: fetchmail.c:1788
-msgid "Received"
-msgstr "Recieved"
-
 #: fetchmail.c:1790
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  El nombre de cap�aleres de l'embolcall que s'analitzaran �s: %d\n"
 
 #: fetchmail.c:1793
@@ -1880,133 +1877,133 @@ msgstr "No s'ha pogut desxifrar la codificaci
 msgid "Secret pass phrase: "
 msgstr "Contrasenya secreta: "
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "La cadena '%s' no �s un nombre v�lid.\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "El valor de la cadena '%s' �s %s que %d.\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "m�s petit"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "m�s gran"
 
-#: options.c:380
+#: options.c:329
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "El protocol `%s' especificat no �s v�lid.\n"
 
-#: options.c:424
+#: options.c:371
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "L'autenticaci� `%s' especificada no �s v�lida.\n"
 
-#: options.c:648
+#: options.c:572
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "sintaxi: fetchmail [opcions] [servidor ...]\n"
 
-#: options.c:649
+#: options.c:573
 msgid "  Options are as follows:\n"
 msgstr "  Les opcions s�n les seg�ents:\n"
 
-#: options.c:650
+#: options.c:574
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        mostra aquesta ajuda\n"
 
-#: options.c:651
+#: options.c:575
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     mostra informaci� sobre la versi�\n"
 
-#: options.c:653
+#: options.c:577
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       comprova si hi ha correu sense recollir-lo\n"
 
-#: options.c:654
+#: options.c:578
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      funciona en silenci\n"
 
-#: options.c:655
+#: options.c:579
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     genera missatges informatius i de diagn�stic\n"
 
-#: options.c:656
+#: options.c:580
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      funciona com a dimoni, en intervals de n segons\n"
 
-#: options.c:657
+#: options.c:581
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    funciona com a dimoni, per� en primer terme\n"
 
-#: options.c:658
+#: options.c:582
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        finalitza el proc�s d'un dimoni\n"
 
-#: options.c:659
+#: options.c:583
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     especifica el fitxer on registrar l'activitat\n"
 
-#: options.c:660
+#: options.c:584
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
 msgstr ""
 "      --syslog      en mode dimoni, registra l'activitat via syslog(3)\n"
 
-#: options.c:661
+#: options.c:585
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   no deixa traces a les cap�aleres dels missatges\n"
 
-#: options.c:662
+#: options.c:586
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc usa un fitxer de configuraci� alternatiu\n"
 
-#: options.c:663
+#: options.c:587
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      usa un fixter d'UIDs alternatiu\n"
 
 # last resort
-#: options.c:664
+#: options.c:588
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  especifica el destinatari en �ltima inst�ncia\n"
 
-#: options.c:665
+#: options.c:589
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    redirigeix els missatges retornats cap al postmaster\n"
 
-#: options.c:667
+#: options.c:591
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   interf�cie de xarxa requerida pel funcionament\n"
 
-#: options.c:668
+#: options.c:592
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr ""
 "  -M, --monitor     monitora l'activitat de l'interf�cie especificada\n"
 
-#: options.c:671
+#: options.c:595
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         encripta les comunicacions amb ssl\n"
 
-#: options.c:672
+#: options.c:596
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      fitxer que cont� la clau ssl privada\n"
 
-#: options.c:673
+#: options.c:597
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificat ssl del client\n"
 
-#: options.c:674
+#: options.c:598
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath cam� cap als certificats ssl\n"
 
-#: options.c:675
+#: options.c:599
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2014,159 +2011,165 @@ msgstr ""
 "      --sslfingerprint empremta que ha de coincidir amb el cert. del "
 "servidor.\n"
 
-#: options.c:676
+#: options.c:600
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    obliga l'�s del protocol ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:678
+#: options.c:602
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      especifica l'ordre externa per obrir una connexi�\n"
 
-#: options.c:679
+#: options.c:603
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plogout     especifica l'ordre externa per obrir una connexi� smtp\n"
 
-#: options.c:681
+#: options.c:605
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    especifica el protocol que s'usa per obtenir el correu\n"
 
-#: options.c:682
+#: options.c:606
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        obliga l'�s d'UIDLs (nom�s pop3)\n"
 
-#: options.c:683
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:607
+#, fuzzy
+msgid "  -P, --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        port TCP/IP al qual connectar-se\n"
 
-#: options.c:684
+#: options.c:608
+msgid ""
+"      --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+
+#: options.c:609
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        tipus d'autenticaci� (password/kerberos/ssh/otp)\n"
 
-#: options.c:685
+#: options.c:610
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     temps d'espera per la resposta del servidor\n"
 
-#: options.c:686
+#: options.c:611
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    cap�alera que cont� l'adre�a de l'embolcall\n"
 
-#: options.c:687
+#: options.c:612
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    prefix que es suprimeix del nom d'usuari local\n"
 
-#: options.c:688
+#: options.c:613
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   servei de correu principal\n"
 
-#: options.c:689
+#: options.c:614
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  afegeix el rastre de l'obtenci� a la cap�alera Received\n"
 
-#: options.c:691
+#: options.c:616
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    especifica el nom de login al servidor\n"
 
-#: options.c:692
+#: options.c:617
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         recull els missatges tant nous com vells\n"
 
-#: options.c:693
+#: options.c:618
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr ""
 "  -K, --nokeep      esborra els missatges nous despr�s de recollir-los\n"
 
-#: options.c:694
+#: options.c:619
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        deixa els missatges al servidor un cop recollits\n"
 
-#: options.c:695
+#: options.c:620
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       esborra els missatges vells del servidor\n"
 
-#: options.c:696
+#: options.c:621
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  esborra els missatges excessivament grans\n"
 
-#: options.c:697
+#: options.c:622
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   no reescriu les adreces de l'encap�alament\n"
 
-#: options.c:698
+#: options.c:623
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       no recull els missatges que superin la mida "
 "especificada\n"
 
-#: options.c:699
+#: options.c:624
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval entre avisos de notificaci� de correu\n"
 
-#: options.c:701
+#: options.c:626
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    estableix el host pel reenviament via SMTP\n"
 
-#: options.c:702
+#: options.c:627
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains recull el correu pels dominis especificats\n"
 
-#: options.c:703
+#: options.c:628
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress estableix el domini usat pel lliurament via SMTP\n"
 
-#: options.c:704
+#: options.c:629
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    estableix el nom complet SMTP nomusuari@domini\n"
 
-#: options.c:705
+#: options.c:630
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 "  -Z, --antispam,   estableix els valors reconeguts com a resposta antispam\n"
 
-#: options.c:706
+#: options.c:631
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  estableix el l�mit de missatges SMTP enviats en s�rie\n"
 
-#: options.c:707
+#: options.c:632
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  estableix el l�mit de missatges obtinguts per connexi�\n"
 
-#: options.c:708
+#: options.c:633
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit estableix el l�mit de mida dels missatges\n"
 
-#: options.c:709
+#: options.c:634
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    fa una cerca bin�ria de UIDLs\n"
 
-#: options.c:710
+#: options.c:635
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     estableix el m�xim de missatges eliminats entre "
 "supressions\n"
 
-#: options.c:711
+#: options.c:636
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         estableix l'MDA que s'utilitza pel reenviament\n"
 
-#: options.c:712
+#: options.c:637
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       estableix el fitxer de sortida BSMTP\n"
 
-#: options.c:713
+#: options.c:638
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usa LMTP (RFC2033) pel lliurament\n"
 
-#: options.c:714
+#: options.c:639
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      estableix el nom de la carpeta remota\n"
 
-#: options.c:715
+#: options.c:640
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    mostra punts de progressi� �dhuc als fitxers de "
@@ -2227,7 +2230,7 @@ msgstr "opcions del servidor despr
 msgid "SDPS not enabled."
 msgstr "SDPS no habilitat."
 
-#: rcfile_y.y:206
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2235,7 +2238,7 @@ msgstr ""
 "fetchmail: l'opci� d'interf�cie nom�s est� suportada en Linux (sense IPv6) i "
 "FreeBSD\n"
 
-#: rcfile_y.y:213
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2243,25 +2246,25 @@ msgstr ""
 "fetchmail: l'opci� de monitoraci� nom�s est� suportada en Linux (sense IPv6) "
 "i FreeBSD\n"
 
-#: rcfile_y.y:326
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr "SSL no habilitat"
 
-#: rcfile_y.y:375
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr "final de l'entrada"
 
-#: rcfile_y.y:412
+#: rcfile_y.y:418
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "El fitxer %s ha de ser un fitxer ordinari.\n"
 
-#: rcfile_y.y:422
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "El fitxer %s no pot tenir permisos m�s que -rwx--x--- (0710).\n"
 
-#: rcfile_y.y:434
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "El fitxer %s ha de ser propietat vostra.\n"
@@ -2462,11 +2465,21 @@ msgstr "MD5 que s'aplica al bloc de dades:\n"
 msgid "MD5 result is: \n"
 msgstr "L'MD5 resultant �s: \n"
 
-#: servport.c:73
-#, c-format
-msgid ""
-"Cannot resolve service %s to port.  Please specify the service as decimal "
-"port number.\n"
+#: servport.c:52
+#, fuzzy, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr "fetchmail: getaddrinfo(\"%s\",\"%s\") error: %s\n"
+
+#: servport.c:78
+#, fuzzy, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+"No s'ha pogut resoldre el port pel servei %s. Especifiqueu un nombre decimal "
+"per al port.\n"
+
+#: servport.c:79
+#, fuzzy
+msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 "No s'ha pogut resoldre el port pel servei %s. Especifiqueu un nombre decimal "
 "per al port.\n"
@@ -2641,122 +2654,126 @@ msgid "execvp(%s) failed\n"
 msgstr "la rutina execvp(%s) ha fallat\n"
 
 #: socket.c:281
-#, c-format
-msgid "fetchmail: getaddrinfo(\"%s\",\"%s\") error: %s\n"
+#, fuzzy, c-format
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "fetchmail: getaddrinfo(\"%s\",\"%s\") error: %s\n"
 
-#: socket.c:624
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
+
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organitzaci� emissora: %s\n"
 
-#: socket.c:626
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Atenci�: El nom de l'organitzaci� emissora �s massa llarg (pot estar "
 "truncat).\n"
 
-#: socket.c:628
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr "Organitzaci� desconeguda\n"
 
-#: socket.c:630
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Nom com� de l'emissor: %s\n"
 
-#: socket.c:632
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Atenci�: El nom com� de l'emissor �s massa llarg (pot estar truncat).\n"
 
-#: socket.c:634
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr "Nom com� de l'emissor desconegut\n"
 
-#: socket.c:638
+#: socket.c:640
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Nom com� del servidor: %s\n"
 
-#: socket.c:642
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificat incorrecte: El component CommonName �s massa llarg!\n"
 
-#: socket.c:658
+#: socket.c:660
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "El nom com� del servidor no encaixa: %s != %s\n"
 
-#: socket.c:664
+#: socket.c:666
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "El nom del servidor no est� definit, no es pot verificar el certificat!\n"
 
-#: socket.c:669
+#: socket.c:671
 msgid "Unknown Server CommonName\n"
 msgstr "Nom com� del servidor desconegut\n"
 
-#: socket.c:671
+#: socket.c:673
 msgid "Server name not specified in certificate!\n"
 msgstr "El certificat no especifica el nom del servidor!\n"
 
-#: socket.c:681
+#: socket.c:683
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() ha fallat!\n"
 
-#: socket.c:685
+#: socket.c:687
 msgid "Out of memory!\n"
 msgstr "Mem�ria exhaurida!\n"
 
 # digest text
-#: socket.c:693
+#: socket.c:695
 msgid "Digest text buffer too small!\n"
 msgstr "El buffer del sumari de text �s massa petit!\n"
 
-#: socket.c:699
+#: socket.c:701
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Empremta de la clau de %s: %s\n"
 
-#: socket.c:703
+#: socket.c:705
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Les empremtes digitals de %s encaixen.\n"
 
-#: socket.c:706
+#: socket.c:708
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "Les empremtes digitals de %s no encaixen!\n"
 
-#: socket.c:715
+#: socket.c:717
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Error en verificar el certificat del servidor: %s\n"
 
-#: socket.c:721
+#: socket.c:723
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "emissor desconegut (primers %d car�cters): %s\n"
 
-#: socket.c:773
+#: socket.c:775
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor del fitxer fora d'abast per SSL"
 
-#: socket.c:790
+#: socket.c:792
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "El protocol SSL especificat `%s' no �s v�lid, s'usa SSLv23.\n"
 
-#: socket.c:851
+#: socket.c:853
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "La verificaci� del certificat o de l'empremta s'ha om�s!\n"
 
-#: socket.c:923
+#: socket.c:925
 msgid "Cygwin socket read retry\n"
 msgstr "Es torna a intentar llegir el socket Cygwin\n"
 
-#: socket.c:926
+#: socket.c:928
 msgid "Cygwin socket read retry failed!\n"
 msgstr "El reintent de llegir el socket Cygwin ha fallat!\n"
 
@@ -2799,51 +2816,51 @@ msgstr "no s'ha trobat cap adre
 msgid "found Received address `%s'\n"
 msgstr "s'ha trobat l'adre�a `%s' a la cap�alera Received\n"
 
-#: transact.c:530
+#: transact.c:532
 msgid "message delimiter found while scanning headers\n"
 msgstr ""
 "s'ha trobat un delimitador de missatge quan s'analitzava l'encap�alament\n"
 
-#: transact.c:551
+#: transact.c:553
 msgid "incorrect header line found while scanning headers\n"
 msgstr "s'ha trobat una l�nia incorrecta quan s'analitzava l'encap�alament\n"
 
-#: transact.c:553
+#: transact.c:555
 #, c-format
 msgid "line: %s"
 msgstr "l�nia: %s"
 
-#: transact.c:1067
+#: transact.c:1076
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "cap conincid�ncia local, reenviant a %s\n"
 
-#: transact.c:1082
+#: transact.c:1091
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenviament i eliminaci� omesos a causa d'errors de DNS\n"
 
-#: transact.c:1194
+#: transact.c:1203
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escrivint cap�aleres msgblk RFC822\n"
 
-#: transact.c:1215
+#: transact.c:1224
 msgid "no recipient addresses matched declared local names"
 msgstr "cap adre�a de destinatari coincideix amb els noms locals declarats"
 
-#: transact.c:1222
+#: transact.c:1231
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "l'adre�a del destinatari %s no lliga amb cap nom local"
 
-#: transact.c:1231
+#: transact.c:1240
 msgid "message has embedded NULs"
 msgstr "el missatge cont� car�cters NUL"
 
-#: transact.c:1239
+#: transact.c:1248
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "el receptor SMTP ha rebutjat les adreces locals de destinaci�: "
 
-#: transact.c:1367
+#: transact.c:1376
 msgid "writing message text\n"
 msgstr "escrivint el text del missatge\n"
 
@@ -2918,3 +2935,7 @@ msgstr "la rutina malloc ha fallat\n"
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "la rutina realloc ha fallat\n"
+
+# nom de la cap�alera
+#~ msgid "Received"
+#~ msgstr "Recieved"
diff --git a/po/cs.po b/po/cs.po
index e6118e45..d92fefb8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,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: 2005-09-21 10:45+0200\n"
+"POT-Creation-Date: 2005-09-25 13:01+0200\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"
@@ -370,7 +370,7 @@ msgstr "vybírám nebo znovu kontroluji implicitní složku\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s na %s (složka %s)"
 
-#: driver.c:1314 rcfile_y.y:374
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "%s na %s"
@@ -867,13 +867,15 @@ msgstr ""
 "varování: Nežádejte podporu, pokud všechna pošta půjde k postmasterovi!\n"
 
 #: fetchmail.c:1185
-#, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr "Nastavení pro %s není platné, číslo portu nesmí být záporné.\n"
 
 #: fetchmail.c:1192
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "Nastavení %s není platné, RPOP vyžaduje privilegovaný port\n"
 
 #: fetchmail.c:1210
@@ -1417,13 +1419,9 @@ msgstr "  Směrování dle adresy v obálce je zakázáno\n"
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Předpokládá se, že hlavička obálky je: %s\n"
 
-#: fetchmail.c:1788
-msgid "Received"
-msgstr "Received"
-
 #: fetchmail.c:1790
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Počet hlaviček obálky, které zpracovávat: %d\n"
 
 #: fetchmail.c:1793
@@ -1851,79 +1849,79 @@ msgstr "Nemohu dekódovat výzvu OTP\n"
 msgid "Secret pass phrase: "
 msgstr "Tajné heslo: "
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Řetězec '%s' není platné číslo.\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Hodnota řetězce '%s' je %s než %d.\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "menší"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "větší"
 
-#: options.c:380
+#: options.c:329
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Zadán neplatný protokol `%s'.\n"
 
-#: options.c:424
+#: options.c:371
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Zadána neplatná autentizace `%s'.\n"
 
-#: options.c:648
+#: options.c:572
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "použití: fetchmail [přepínače] [server ...]\n"
 
-#: options.c:649
+#: options.c:573
 msgid "  Options are as follows:\n"
 msgstr "  Přepínače jsou následující:\n"
 
-#: options.c:650
+#: options.c:574
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        zobrazit tuto nápovědu k přepínačům\n"
 
-#: options.c:651
+#: options.c:575
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     zobrazit informace o verzi\n"
 
-#: options.c:653
+#: options.c:577
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       zkontrolovat zprávy bez stahování\n"
 
-#: options.c:654
+#: options.c:578
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      pracovat potichu\n"
 
-#: options.c:655
+#: options.c:579
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     pracovat hlasitě (diagnostický výstup)\n"
 
-#: options.c:656
+#: options.c:580
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      spustit jako démona jednou za n sekund\n"
 
-#: options.c:657
+#: options.c:581
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    neodpojovat proces démona\n"
 
-#: options.c:658
+#: options.c:582
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        zabít proces démona\n"
 
-#: options.c:659
+#: options.c:583
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     název souboru se záznamem\n"
 
-#: options.c:660
+#: options.c:584
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -1931,205 +1929,211 @@ msgstr ""
 "      --syslog      používat syslog(3) pro většinu zpráv při běhu jako "
 "démon\n"
 
-#: options.c:661
+#: options.c:585
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   nezapisovat Received a povolit podvržení počítače\n"
 
-#: options.c:662
+#: options.c:586
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc alternativní konfigurační soubor\n"
 
-#: options.c:663
+#: options.c:587
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      alternativní soubor UID\n"
 
-#: options.c:664
+#: options.c:588
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  nouzový příjemce pošty\n"
 
-#: options.c:665
+#: options.c:589
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    přesměrovat vracené zprávy od uživatele postmasterovi.\n"
 
-#: options.c:667
+#: options.c:591
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   vyžadované rozhraní\n"
 
-#: options.c:668
+#: options.c:592
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     sledovat aktivitu rozhraní\n"
 
-#: options.c:671
+#: options.c:595
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         povolit sezení šifrované ssl\n"
 
-#: options.c:672
+#: options.c:596
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      soubor se soukromým klíčem ssl\n"
 
-#: options.c:673
+#: options.c:597
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certifikát ssl klienta\n"
 
-#: options.c:674
+#: options.c:598
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath cesta k certifikátům ssl\n"
 
-#: options.c:675
+#: options.c:599
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
 msgstr ""
 "      --sslfingerprint otisk, který musí odpovídat certifikátu serveru.\n"
 
-#: options.c:676
+#: options.c:600
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    vynutit protokol ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:678
+#: options.c:602
 msgid "      --plugin      specify external command to open connection\n"
 msgstr "      --plugin      externí příkaz pro otevření spojení\n"
 
-#: options.c:679
+#: options.c:603
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr "      --plugout     externí příkaz pro otevření spojení smtp\n"
 
-#: options.c:681
+#: options.c:605
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    protokol pro stahování (viz manuálovou stránku)\n"
 
-#: options.c:682
+#: options.c:606
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        vnutit používání UIDL (jen pop3)\n"
 
-#: options.c:683
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:607
+#, fuzzy
+msgid "  -P, --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        port TCP/IP služby, ke kterému se připojit\n"
 
-#: options.c:684
+#: options.c:608
+msgid ""
+"      --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+
+#: options.c:609
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        typ autentizace (password/kerberos/ssh/otp)\n"
 
-#: options.c:685
+#: options.c:610
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     čas čekání na odpověď serveru\n"
 
-#: options.c:686
+#: options.c:611
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    hlavička adresy z obálky\n"
 
-#: options.c:687
+#: options.c:612
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    předpona, kterou odstranit z místního id uživatelů\n"
 
-#: options.c:688
+#: options.c:613
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   principal poštovní služby\n"
 
-#: options.c:689
+#: options.c:614
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  přidat informace pro sledování stahování do hlavičky "
 "Received\n"
 
-#: options.c:691
+#: options.c:616
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    jméno uživatele na serveru\n"
 
-#: options.c:692
+#: options.c:617
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         stahovat staré i nové zprávy\n"
 
-#: options.c:693
+#: options.c:618
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      odstranit nové zprávy po stažení\n"
 
-#: options.c:694
+#: options.c:619
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        ponechat nové zprávy po stažení\n"
 
-#: options.c:695
+#: options.c:620
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       odstranit staré zprávy ze serveru\n"
 
-#: options.c:696
+#: options.c:621
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       odstranit staré zprávy ze serveru\n"
 
-#: options.c:697
+#: options.c:622
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   nepřepisovat adresy v hlavičkách\n"
 
-#: options.c:698
+#: options.c:623
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       nestahovat zprávy překračující zadanou velikost\n"
 
-#: options.c:699
+#: options.c:624
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    interval zasílání varovných zpráv\n"
 
-#: options.c:701
+#: options.c:626
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    počítač pro přeposílání SMTP\n"
 
-#: options.c:702
+#: options.c:627
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains stahovat poštu pro zadané domény\n"
 
-#: options.c:703
+#: options.c:628
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpadress  používaná doména SMTP při doručování\n"
 
-#: options.c:704
+#: options.c:629
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    nastavit plné jméno SMTP jméno@doména\n"
 
-#: options.c:705
+#: options.c:630
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    nastavit hodnoty antispammingových odpovědí\n"
 
-#: options.c:706
+#: options.c:631
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr "  -b, --batchlimit  nastavit limit dávkování pro spojení SMTP\n"
 
-#: options.c:707
+#: options.c:632
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr "  -B, --fetchlimit  nastavit limit stahování pro připojení k serveru\n"
 
-#: options.c:708
+#: options.c:633
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit nastavit limit velikosti stahovaných zpráv\n"
 
-#: options.c:709
+#: options.c:634
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    hledat UIDL binárně\n"
 
-#: options.c:710
+#: options.c:635
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     nastavit maximální počet odstraňování mezi čištěními\n"
 
-#: options.c:711
+#: options.c:636
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         nastavit MDA, který používat pro přeposílání\n"
 
-#: options.c:712
+#: options.c:637
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       nastavit výstupní soubor BSMTP\n"
 
-#: options.c:713
+#: options.c:638
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        pro doručení používat LMTP (RFC2033)\n"
 
-#: options.c:714
+#: options.c:639
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      název vzdálené složky\n"
 
-#: options.c:715
+#: options.c:640
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    zobrazovat tečky průběhu i v souborech se záznamy\n"
@@ -2187,7 +2191,7 @@ msgstr "přepínač serveru po přepínačích uživatele"
 msgid "SDPS not enabled."
 msgstr "SDPS není povoleno."
 
-#: rcfile_y.y:206
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2195,32 +2199,32 @@ msgstr ""
 "fetchmail: přepínač interface je podporován jen v Linuxu (bez IPv6) a "
 "FreeBSD\n"
 
-#: rcfile_y.y:213
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 "fetchmail: přepínač monitor je podporován jen v Linuxu (bez IPv6) a FreeBSD\n"
 
-#: rcfile_y.y:326
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr "SSL není povoleno"
 
-#: rcfile_y.y:375
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr "konec vstupu"
 
-#: rcfile_y.y:412
+#: rcfile_y.y:418
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Soubor %s musí být obyčejný soubor.\n"
 
-#: rcfile_y.y:422
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "Soubor %s nesmí mít oprávnění více než -rwx--x--- (0710).\n"
 
-#: rcfile_y.y:434
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Musíte vlastnit soubor %s.\n"
@@ -2420,11 +2424,18 @@ msgstr "MD5 se používá na blok dat:\n"
 msgid "MD5 result is: \n"
 msgstr "Výsledek MD5 je:\n"
 
-#: servport.c:73
+#: servport.c:52
+#, fuzzy, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+
+#: servport.c:78
 #, c-format
-msgid ""
-"Cannot resolve service %s to port.  Please specify the service as decimal "
-"port number.\n"
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+
+#: servport.c:79
+msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 
 #: sink.c:238
@@ -2595,116 +2606,120 @@ msgstr "execvp(%s) selhalo\n"
 
 #: socket.c:281
 #, fuzzy, c-format
-msgid "fetchmail: getaddrinfo(\"%s\",\"%s\") error: %s\n"
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:624
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
+
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organizace vydavatele: %s\n"
 
-#: socket.c:626
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Varování: Název organizace vydavatele příliš dlouhý (možná zkrácen).\n"
 
-#: socket.c:628
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr "Neznámá organizace\n"
 
-#: socket.c:630
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "Jméno vydavatele: %s\n"
 
-#: socket.c:632
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Varování: Jméno vydavatele příliš dlouhé (možná zkráceno).\n"
 
-#: socket.c:634
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr "Neznámé jméno vydavatele\n"
 
-#: socket.c:638
+#: socket.c:640
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "Jméno serveru: %s\n"
 
-#: socket.c:642
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Špatný certifikát: Jméno předmětu příliš dlouhé!\n"
 
-#: socket.c:658
+#: socket.c:660
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Jméno serveru neodpovídá: %s != %s\n"
 
-#: socket.c:664
+#: socket.c:666
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Jméno serveru nenastaveno, nemohu ověřit certifikát!\n"
 
-#: socket.c:669
+#: socket.c:671
 msgid "Unknown Server CommonName\n"
 msgstr "Neznámé jméno serveru\n"
 
-#: socket.c:671
+#: socket.c:673
 msgid "Server name not specified in certificate!\n"
 msgstr "Jméno serveru není v certifikátu zadáno!\n"
 
-#: socket.c:681
+#: socket.c:683
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() selhalo!\n"
 
-#: socket.c:685
+#: socket.c:687
 msgid "Out of memory!\n"
 msgstr "Nedostatek paměti!\n"
 
-#: socket.c:693
+#: socket.c:695
 msgid "Digest text buffer too small!\n"
 msgstr "Vyrovnávací paměť textu digestu příliš malá!\n"
 
-#: socket.c:699
+#: socket.c:701
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "otisk klíče %s: %s\n"
 
-#: socket.c:703
+#: socket.c:705
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "otisky %s odpovídají.\n"
 
-#: socket.c:706
+#: socket.c:708
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "otisky %s neodpovídají.\n"
 
-#: socket.c:715
+#: socket.c:717
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Chyba ověřování certifikátu serveru: %s\n"
 
-#: socket.c:721
+#: socket.c:723
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "neznámý vydavatel (prvních %d znaků): %s\n"
 
-#: socket.c:773
+#: socket.c:775
 msgid "File descriptor out of range for SSL"
 msgstr "Deskriptor souboru mimo rozsah pro SSL"
 
-#: socket.c:790
+#: socket.c:792
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Zadán neplatný protokol SSL `%s', používám implicitní (SSLv23).\n"
 
-#: socket.c:851
+#: socket.c:853
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Ověření certifikátu/otisku bylo nějak přeskočeno!\n"
 
-#: socket.c:923
+#: socket.c:925
 msgid "Cygwin socket read retry\n"
 msgstr "Další pokus čtení ze socektu Cygwin\n"
 
-#: socket.c:926
+#: socket.c:928
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Další pokus čtení ze socektu Cygwin selhal!\n"
 
@@ -2746,50 +2761,50 @@ msgstr "nenalezena adresa Received\n"
 msgid "found Received address `%s'\n"
 msgstr "nalezena adresa Received `%s'\n"
 
-#: transact.c:530
+#: transact.c:532
 msgid "message delimiter found while scanning headers\n"
 msgstr "při prohledávání hlaviček byl nalezen oddělovač zprávy\n"
 
-#: transact.c:551
+#: transact.c:553
 msgid "incorrect header line found while scanning headers\n"
 msgstr "při prohledávání hlaviček byl nalezen neplatný řádek hlavičky\n"
 
-#: transact.c:553
+#: transact.c:555
 #, c-format
 msgid "line: %s"
 msgstr "řádek: %s"
 
-#: transact.c:1067
+#: transact.c:1076
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "nevyhovuje žádná místní adresa, přeposílám na %s\n"
 
-#: transact.c:1082
+#: transact.c:1091
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "přeposílání a odstraňování bylo zrušeno kvůli chybám DNS\n"
 
-#: transact.c:1194
+#: transact.c:1203
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "zapisuji RFC822 msgblk.headers\n"
 
-#: transact.c:1215
+#: transact.c:1224
 msgid "no recipient addresses matched declared local names"
 msgstr "žádné adresy příjemců neodpovídaly deklarovaným místním jménům"
 
-#: transact.c:1222
+#: transact.c:1231
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "adresa příjemce %s neodpovídala žádnému místnímu jménu"
 
-#: transact.c:1231
+#: transact.c:1240
 msgid "message has embedded NULs"
 msgstr "zpráva obsahuje vložené NUL"
 
-#: transact.c:1239
+#: transact.c:1248
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "démon SMTP odmítl adresy místních příjemců: "
 
-#: transact.c:1367
+#: transact.c:1376
 msgid "writing message text\n"
 msgstr "zapisuji text zprávy\n"
 
@@ -2865,6 +2880,9 @@ msgstr "malloc selhalo\n"
 msgid "realloc failed\n"
 msgstr "realloc selhalo\n"
 
+#~ msgid "Received"
+#~ msgstr "Received"
+
 #~ msgid "Cannot support ETRN without gethostbyname(2).\n"
 #~ msgstr "Nemohu podporovat ETRN bez gethostbyname(2).\n"
 
diff --git a/po/es.po b/po/es.po
index 9d716e44..b4b4e6b3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.6-pre8\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-09-21 10:45+0200\n"
+"POT-Creation-Date: 2005-09-25 13:01+0200\n"
 "PO-Revision-Date: 2005-07-26 15:56-0300\n"
 "Last-Translator: Javier Kohen <jkohen@users.sourceforge.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -383,7 +383,7 @@ msgstr "seleccionando o re-inquiriendo la carpeta por defecto\n"
 msgid "%s at %s (folder %s)"
 msgstr "%s en %s (carpeta %s)"
 
-#: driver.c:1314 rcfile_y.y:374
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "%s en %s"
@@ -883,14 +883,16 @@ msgstr ""
 "postmaster!\n"
 
 #: fetchmail.c:1185
-#, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr ""
 "La configuración %s es inválida, el número de puerto no puede ser negativo\n"
 
 #: fetchmail.c:1192
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "configuración de %s inválida, RPOP requiere un puerto privilegiado\n"
 
 #: fetchmail.c:1210
@@ -1456,13 +1458,9 @@ msgstr "  El ruteo por la dirección de la envoltura está desactivado\n"
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Se asume que el encabezado de la envoltura es: %s\n"
 
-#: fetchmail.c:1788
-msgid "Received"
-msgstr "Recibido"
-
 #: fetchmail.c:1790
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Número del encabezado de la envoltura a ser procesado: %d\n"
 
 #: fetchmail.c:1793
@@ -1891,82 +1889,82 @@ msgstr "No fue posible decodificar el desafío OTP\n"
 msgid "Secret pass phrase: "
 msgstr "Frase clave secreta: "
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "La cadena '%s' no es un cadena de números válida.\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "El valor de la cadena '%s' es %s que %d.\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "menor"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "mayor"
 
-#: options.c:380
+#: options.c:329
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "El protocolo ‘%s’ especificado es inválido.\n"
 
-#: options.c:424
+#: options.c:371
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Fue especificada una autenticación ‘%s’ inválida.\n"
 
-#: options.c:648
+#: options.c:572
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "uso:  fetchmail [opciones] [servidor ...]\n"
 
-#: options.c:649
+#: options.c:573
 msgid "  Options are as follows:\n"
 msgstr "  Las opciones son las siguientes:\n"
 
-#: options.c:650
+#: options.c:574
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        muestra esta ayuda\n"
 
-#: options.c:651
+#: options.c:575
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     muestra información sobre la versión\n"
 
-#: options.c:653
+#: options.c:577
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       verifica si hay mensajes sin recibirlos\n"
 
-#: options.c:654
+#: options.c:578
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      trabajar silenciosamente\n"
 
-#: options.c:655
+#: options.c:579
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr ""
 "  -v, --verbose     trabajar ruidosamente (información de diagnóstico)\n"
 
-#: options.c:656
+#: options.c:580
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr ""
 "  -d, --daemon      correr en segundo plano y activarse una vez cada n "
 "segundos\n"
 
-#: options.c:657
+#: options.c:581
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    no lanzar un proceso en segundo plano\n"
 
-#: options.c:658
+#: options.c:582
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        terminar el proceso en segundo plano\n"
 
-#: options.c:659
+#: options.c:583
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     especificar el nombre del archivo de registro\n"
 
-#: options.c:660
+#: options.c:584
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -1974,54 +1972,54 @@ msgstr ""
 "      --syslog      usar syslog(3) para la mayoría de los mensajes cuando se "
 "ejecuta en segundo plano\n"
 
-#: options.c:661
+#: options.c:585
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   no escribir ‘Received’ y activar falsificación de "
 "máquina\n"
 
-#: options.c:662
+#: options.c:586
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr ""
 "  -f, --fetchmailrc especificar archivo de control de ejecución alterno\n"
 
-#: options.c:663
+#: options.c:587
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      especificar archivo de UIDs alterno\n"
 
-#: options.c:664
+#: options.c:588
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  especificar el recipiente de último recurso\n"
 
-#: options.c:665
+#: options.c:589
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    redirigir rebotes del usuario al postmaster.\n"
 
-#: options.c:667
+#: options.c:591
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   especificación de interfaz requerida\n"
 
-#: options.c:668
+#: options.c:592
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitorear interfaz por actividad\n"
 
-#: options.c:671
+#: options.c:595
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         activar sesión encriptada con ssl\n"
 
-#: options.c:672
+#: options.c:596
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      archivo de llave privada ssl\n"
 
-#: options.c:673
+#: options.c:597
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certificado ssl del cliente\n"
 
-#: options.c:674
+#: options.c:598
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath ubicación de los certificados ssl\n"
 
-#: options.c:675
+#: options.c:599
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2029,166 +2027,172 @@ msgstr ""
 "      --sslfingerprint huella digital que debe coincidir con la del "
 "certificado del servidor.\n"
 
-#: options.c:676
+#: options.c:600
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    forzar protocolo ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:678
+#: options.c:602
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      especificar el comando externo para abrir una conexión\n"
 
-#: options.c:679
+#: options.c:603
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     especificar el comando externo para abrir una conexión "
 "smtp\n"
 
-#: options.c:681
+#: options.c:605
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    especificar el protocolo de recepción (ver página man)\n"
 
-#: options.c:682
+#: options.c:606
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        forzar el uso de UIDLs (sólo pop3)\n"
 
-#: options.c:683
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:607
+#, fuzzy
+msgid "  -P, --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        puerto TCP/IP al cual conectarse\n"
 
-#: options.c:684
+#: options.c:608
+msgid ""
+"      --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+
+#: options.c:609
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        tipo de autenticación (clave/kerberos/ssh/otp)\n"
 
-#: options.c:685
+#: options.c:610
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     tiempo de espera por respuesta del servidor\n"
 
-#: options.c:686
+#: options.c:611
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    envolver encabezados de dirección\n"
 
-#: options.c:687
+#: options.c:612
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    prefijo a remover de la identificación local del "
 "usuario\n"
 
-#: options.c:688
+#: options.c:613
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   servicio de correo principal\n"
 
-#: options.c:689
+#: options.c:614
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  añadir información sobre trazado de consultas al "
 "encabezado Recibido\n"
 
-#: options.c:691
+#: options.c:616
 msgid "  -u, --username    specify users's login on server\n"
 msgstr ""
 "  -u, --username    especificar el ‘login’ del usuario en el servidor\n"
 
-#: options.c:692
+#: options.c:617
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         recibir mensajes viejos y nuevos\n"
 
-#: options.c:693
+#: options.c:618
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      borrar nuevos mensajes luego de recibidos\n"
 
-#: options.c:694
+#: options.c:619
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        guardar nuevos mensajes luego de recibidos\n"
 
-#: options.c:695
+#: options.c:620
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       borrar viejos mensajes del servidor\n"
 
-#: options.c:696
+#: options.c:621
 #, fuzzy
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "  -F, --flush       borrar viejos mensajes del servidor\n"
 
-#: options.c:697
+#: options.c:622
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   no reescribir las direcciones del encabezado\n"
 
-#: options.c:698
+#: options.c:623
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       no recibir los mensajes más largos que lo especificado\n"
 
-#: options.c:699
+#: options.c:624
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    intervalo entre las notificaciones de correo\n"
 
-#: options.c:701
+#: options.c:626
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    configurar la máquina de reenvío de SMTP\n"
 
-#: options.c:702
+#: options.c:627
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains recibir correo para los dominios especificados\n"
 
-#: options.c:703
+#: options.c:628
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr "  -D, --smtpaddress configurar el dominio de entrega de SMTP a usar\n"
 
-#: options.c:704
+#: options.c:629
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 "      --smtpname    usar nombreusuario@dominio como nombre completo para "
 "SMTP\n"
 
-#: options.c:705
+#: options.c:630
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    configurar los valores de respuesta anti‘spam’\n"
 
-#: options.c:706
+#: options.c:631
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  configurar el límite de mensajes para las conexiones "
 "SMTP\n"
 
-#: options.c:707
+#: options.c:632
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  configurar el límite de mensajes para las conexiones al "
 "servidor\n"
 
-#: options.c:708
+#: options.c:633
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit configurar el límite de tamaño de mensaje\n"
 
-#: options.c:709
+#: options.c:634
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    utilizar búsqueda binaria para los UIDLs\n"
 
-#: options.c:710
+#: options.c:635
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     configurar la cantidad de mensajes borrados entre "
 "eliminaciones\n"
 
-#: options.c:711
+#: options.c:636
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         configurar el MDA para que reenvíe\n"
 
-#: options.c:712
+#: options.c:637
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       configurar archivo de salida de BSMTP\n"
 
-#: options.c:713
+#: options.c:638
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        usar LMTP (RFC2033) para entrega\n"
 
-#: options.c:714
+#: options.c:639
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      especificar nombre de la carpeta remota\n"
 
-#: options.c:715
+#: options.c:640
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    mostrar puntos de progreso incluso en los archivos de "
@@ -2248,7 +2252,7 @@ msgstr "opciones de servidor tras opciones de usuario"
 msgid "SDPS not enabled."
 msgstr "SDPS no activado."
 
-#: rcfile_y.y:206
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2256,7 +2260,7 @@ msgstr ""
 "fetchmail: la opción ‘interface’ solo es soportada bajo Linux (sin IPv6) y "
 "FreeBSD\n"
 
-#: rcfile_y.y:213
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2264,25 +2268,25 @@ msgstr ""
 "fetchmail: la opción ‘monitor’ solo es soportada bajo Linux (sin IPv6) y "
 "FreeBSD\n"
 
-#: rcfile_y.y:326
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr "SSL no está activado"
 
-#: rcfile_y.y:375
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr "fin de entradas"
 
-#: rcfile_y.y:412
+#: rcfile_y.y:418
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "El archivo %s debe ser de tipo normal.\n"
 
-#: rcfile_y.y:422
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "El archivo %s no debe tener mas que los permisos -rwx--x--- (0710).\n"
 
-#: rcfile_y.y:434
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "El archivo %s debe ser poseido por usted.\n"
@@ -2482,11 +2486,18 @@ msgstr "Aplicando MD5 al bloque de datos:\n"
 msgid "MD5 result is: \n"
 msgstr "El resultado de MD5 es: \n"
 
-#: servport.c:73
+#: servport.c:52
+#, fuzzy, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr "fetchmail: getaddrinfo(%s.%s)\n"
+
+#: servport.c:78
 #, c-format
-msgid ""
-"Cannot resolve service %s to port.  Please specify the service as decimal "
-"port number.\n"
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+
+#: servport.c:79
+msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 
 #: sink.c:238
@@ -2659,123 +2670,127 @@ msgstr "execvp(%s) falló\n"
 
 #: socket.c:281
 #, fuzzy, c-format
-msgid "fetchmail: getaddrinfo(\"%s\",\"%s\") error: %s\n"
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "fetchmail: getaddrinfo(%s.%s)\n"
 
-#: socket.c:624
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
+
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organización emisora: %s\n"
 
-#: socket.c:626
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "Cuidado: el Nombre de la Organización emisora es muy largo (posiblemente "
 "truncado).\n"
 
-#: socket.c:628
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr "Organización Desconocida\n"
 
-#: socket.c:630
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "‘CommonName’ del emisor: %s\n"
 
-#: socket.c:632
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "Cuidado: el ‘CommonName’ del emisor es muy largo (posiblemente truncado).\n"
 
-#: socket.c:634
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr "‘CommonName’ del emisor desconocido\n"
 
-#: socket.c:638
+#: socket.c:640
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "‘CommonName’ del servidor: %s\n"
 
-#: socket.c:642
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "Certificado malo: el ‘CommonName’ del sujeto es muy largo!\n"
 
-#: socket.c:658
+#: socket.c:660
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "‘CommonName’ del Servidor no coincide: %s != %s\n"
 
-#: socket.c:664
+#: socket.c:666
 msgid "Server name not set, could not verify certificate!\n"
 msgstr ""
 "El nombre de servidor no fue configurado, ¡no fue posible verificar el "
 "certificado!\n"
 
-#: socket.c:669
+#: socket.c:671
 msgid "Unknown Server CommonName\n"
 msgstr "‘CommonName’ del Servidor desconocido\n"
 
-#: socket.c:671
+#: socket.c:673
 msgid "Server name not specified in certificate!\n"
 msgstr "¡No se especifica el nombre del servidor en el certificado!\n"
 
-#: socket.c:681
+#: socket.c:683
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() falló\n"
 
-#: socket.c:685
+#: socket.c:687
 msgid "Out of memory!\n"
 msgstr "¡No hay memoria!\n"
 
-#: socket.c:693
+#: socket.c:695
 msgid "Digest text buffer too small!\n"
 msgstr "¡El espacio para el resumen de texto es muy chico!\n"
 
-#: socket.c:699
+#: socket.c:701
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Huella digital de la llave %s: %s\n"
 
-#: socket.c:703
+#: socket.c:705
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "Las huellas digitales de %s coinciden.\n"
 
-#: socket.c:706
+#: socket.c:708
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "¡Las huellas digitales de %s no coinciden!\n"
 
-#: socket.c:715
+#: socket.c:717
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "Falló la verificación del certificado del servidor: %s\n"
 
-#: socket.c:721
+#: socket.c:723
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "Emisor desconocido (primeros %d caracteres): %s\n"
 
-#: socket.c:773
+#: socket.c:775
 msgid "File descriptor out of range for SSL"
 msgstr "Descriptor de archivo fuera de rango para SSL"
 
-#: socket.c:790
+#: socket.c:792
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "El protocolo SSL ‘%s’ especificado es inválido, usando el defecto (SSLv23).\n"
 
-#: socket.c:851
+#: socket.c:853
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr ""
 "¡La verificación de certificado/huella digital fue de algún modo saltada!\n"
 
-#: socket.c:923
+#: socket.c:925
 msgid "Cygwin socket read retry\n"
 msgstr "Reintento de lectura del ‘socket’ cygwin\n"
 
-#: socket.c:926
+#: socket.c:928
 msgid "Cygwin socket read retry failed!\n"
 msgstr "¡Falló el reintento de lectura del ‘socket’ cygwin\n"
 
@@ -2817,51 +2832,51 @@ msgstr "no se encontró dirección ‘Received’\n"
 msgid "found Received address `%s'\n"
 msgstr "se encontró la dirección ‘Received’ ‘%s’\n"
 
-#: transact.c:530
+#: transact.c:532
 msgid "message delimiter found while scanning headers\n"
 msgstr "delimitador de mensajes encontrado durante barrido de encabezados\n"
 
-#: transact.c:551
+#: transact.c:553
 msgid "incorrect header line found while scanning headers\n"
 msgstr "encabezado incorrecto encontrado durante la revisión de encabezados\n"
 
-#: transact.c:553
+#: transact.c:555
 #, c-format
 msgid "line: %s"
 msgstr "línea: %s"
 
-#: transact.c:1067
+#: transact.c:1076
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "no hay coincidencias locales, reenviado a %s\n"
 
-#: transact.c:1082
+#: transact.c:1091
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "reenvío y borrado suprimido debido a errores de DNS\n"
 
-#: transact.c:1194
+#: transact.c:1203
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "escribiendo encabezados RFC822\n"
 
-#: transact.c:1215
+#: transact.c:1224
 msgid "no recipient addresses matched declared local names"
 msgstr ""
 "ninguna dirección de destino coincidió con los nombres locales declarados"
 
-#: transact.c:1222
+#: transact.c:1231
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "la dirección de destino %s no coincide con algún nombre local"
 
-#: transact.c:1231
+#: transact.c:1240
 msgid "message has embedded NULs"
 msgstr "el mensaje contiene NULs"
 
-#: transact.c:1239
+#: transact.c:1248
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "El servidor SMTP rechazó las direcciones locales de destino: "
 
-#: transact.c:1367
+#: transact.c:1376
 msgid "writing message text\n"
 msgstr "escribiendo texto del mensaje\n"
 
@@ -2940,6 +2955,9 @@ msgstr "malloc falló\n"
 msgid "realloc failed\n"
 msgstr "realloc falló\n"
 
+#~ msgid "Received"
+#~ msgstr "Recibido"
+
 #~ msgid "Cannot support ETRN without gethostbyname(2).\n"
 #~ msgstr "No se puede soportar ETRN sin gethostbyname(2).\n"
 
diff --git a/po/pl.po b/po/pl.po
index 04063243..50e2cd66 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-09-21 10:45+0200\n"
+"POT-Creation-Date: 2005-09-25 13:01+0200\n"
 "PO-Revision-Date: 2005-09-19 18:50+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -376,7 +376,7 @@ msgstr "ponowna pr
 msgid "%s at %s (folder %s)"
 msgstr "%s na %s (folder %s)"
 
-#: driver.c:1314 rcfile_y.y:374
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "%s na %s"
@@ -874,13 +874,15 @@ msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "uwaga: Nie pro� o pomoc je�li ca�a poczta p�jdzie do postmastera!\n"
 
 #: fetchmail.c:1185
-#, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr "konfiguracja dla %s jest b��dna - numer portu nie mo�e by� ujemny\n"
 
 #: fetchmail.c:1192
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr ""
 "konfiguracja dla %s jest b��dna - RPOP wymaga uprzywilejowanego portu "
 "(<1024)\n"
@@ -1445,13 +1447,9 @@ msgstr "  Obs
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  Nag��wek koperty zosta� ustawiony na: %s\n"
 
-#: fetchmail.c:1788
-msgid "Received"
-msgstr "Received"
-
 #: fetchmail.c:1790
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  Liczba nag��wk�w koperty, kt�re b�d� sprawdzane: %d\n"
 
 #: fetchmail.c:1793
@@ -1884,79 +1882,79 @@ msgstr "Rozkodowanie wyzwania OTP by
 msgid "Secret pass phrase: "
 msgstr "Tajne has�o: "
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "Napis '%s' nie reprezentuje poprawnie zapisanej liczby.\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "Warto�� napisu '%s' jest %s ni� %d.\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "mniejsza"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "wi�ksza"
 
-#: options.c:380
+#: options.c:329
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "Podano b��dny protok� `%s'.\n"
 
-#: options.c:424
+#: options.c:371
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "Podano b��dn� metod� uwierzytelnienia `%s'.\n"
 
-#: options.c:648
+#: options.c:572
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "sk�adnia:  fetchmail [opcje] [serwer ...]\n"
 
-#: options.c:649
+#: options.c:573
 msgid "  Options are as follows:\n"
 msgstr "  Mo�na poda� nast�puj�ce opcje:\n"
 
-#: options.c:650
+#: options.c:574
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        wy�wietla ten opis opcji\n"
 
-#: options.c:651
+#: options.c:575
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     wy�wietla informacje o wersji\n"
 
-#: options.c:653
+#: options.c:577
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       sprawdza czy s� nowe listy bez ich pobierania\n"
 
-#: options.c:654
+#: options.c:578
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      wy��cza komunikaty\n"
 
-#: options.c:655
+#: options.c:579
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr "  -v, --verbose     w��cza wy�wietlanie szczeg�owych komunikat�w\n"
 
-#: options.c:656
+#: options.c:580
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      w��cza uruchamianie w trybie demona co n sekund\n"
 
-#: options.c:657
+#: options.c:581
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    wy��cza prac� w tle w trybie demona\n"
 
-#: options.c:658
+#: options.c:582
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        ko�czy prac� demona\n"
 
-#: options.c:659
+#: options.c:583
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     podaje nazw� pliku kroniki\n"
 
-#: options.c:660
+#: options.c:584
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -1964,52 +1962,52 @@ msgstr ""
 "      --syslog      w��cza wy�wietlanie wi�kszo�ci komunikat�w przez syslog"
 "(3)\n"
 
-#: options.c:661
+#: options.c:585
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr ""
 "      --invisible   w��cza udawanie hosta i nie dodaje nag��wk�w Received\n"
 
-#: options.c:662
+#: options.c:586
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc okre�la alternatywny plik konfiguracyjny\n"
 
-#: options.c:663
+#: options.c:587
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      okre�la alternatywny plik z UID-ami\n"
 
-#: options.c:664
+#: options.c:588
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  adres na kt�ry b�d� wysy�ane b��dne listy\n"
 
-#: options.c:665
+#: options.c:589
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr "      --nobounce    przekierowuje odbit� poczt� do postmastera.\n"
 
-#: options.c:667
+#: options.c:591
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   wymagana nazwa interfejsu\n"
 
-#: options.c:668
+#: options.c:592
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     monitoruje dany interfejs czekaj�c na ruch\n"
 
-#: options.c:671
+#: options.c:595
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         w��cza sesje kodowane ssl\n"
 
-#: options.c:672
+#: options.c:596
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      plik klucza prywatnego ssl\n"
 
-#: options.c:673
+#: options.c:597
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     certyfikat klienta ssl\n"
 
-#: options.c:674
+#: options.c:598
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath �cie�ka do certyfikat�w ssl\n"
 
-#: options.c:675
+#: options.c:599
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2017,165 +2015,171 @@ msgstr ""
 "      --sslfingerprint odcisk, kt�ry musi pasowa� do odcisku certyfikatu "
 "serwera.\n"
 
-#: options.c:676
+#: options.c:600
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr "      --sslproto    wymusza protok� ssl (ssl2/ssl3/tls1)\n"
 
-#: options.c:678
+#: options.c:602
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      �cie�ka do zewn�trznego polecenia otwieraj�cego "
 "po��czenie\n"
 
-#: options.c:679
+#: options.c:603
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     �cie�ka do zewn. polecenia otwieraj�cego po��czenie "
 "smtp\n"
 
-#: options.c:681
+#: options.c:605
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr ""
 "  -p, --protocol    okre�la protok� kt�rym b�d� pobierane listy (patrz "
 "manual)\n"
 
-#: options.c:682
+#: options.c:606
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr "  -U, --uidl        wymusza u�ywanie UIDL (tylko POP3)\n"
 
-#: options.c:683
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:607
+#, fuzzy
+msgid "  -P, --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        okre�la port TCP/IP na kt�ry nale�y si� ��czy�\n"
 
-#: options.c:684
+#: options.c:608
+msgid ""
+"      --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+
+#: options.c:609
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr ""
 "      --auth        okre�la metod� uwierzytelnienia (has�o/Kerberos/ssh/"
 "otp)\n"
 
-#: options.c:685
+#: options.c:610
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     limit czasu oczekiwania na odpowied� serwera\n"
 
-#: options.c:686
+#: options.c:611
 msgid "  -E, --envelope    envelope address header\n"
 msgstr ""
 "  -E, --envelope    okre�la nazw� nag��wka zawieraj�cego adres z koperty\n"
 
-#: options.c:687
+#: options.c:612
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr ""
 "  -Q, --qvirtual    przedrostek, kt�ry b�dzie usuwany z nazwy u�ytkownika\n"
 
-#: options.c:688
+#: options.c:613
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   zarz�dca us�ugi pocztowej\n"
 
-#: options.c:689
+#: options.c:614
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  dodaje informacje o �ledzeniu po��czenia do Received\n"
 
-#: options.c:691
+#: options.c:616
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    okre�la login u�ytkownika na serwerze\n"
 
-#: options.c:692
+#: options.c:617
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         pobiera wszystkie listy, stare i nowe\n"
 
-#: options.c:693
+#: options.c:618
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      kasuje nowe listy po pobraniu\n"
 
-#: options.c:694
+#: options.c:619
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        po pobraniu pozostawia nowe listy na serwerze\n"
 
-#: options.c:695
+#: options.c:620
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       kasuje stare listy z serwera\n"
 
-#: options.c:696
+#: options.c:621
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  kasuje zbyt du�e listy z serwera\n"
 
-#: options.c:697
+#: options.c:622
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   nie przepisuje adres�w w nag��wkach\n"
 
-#: options.c:698
+#: options.c:623
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr "  -l, --limit       nie pobiera list�w wi�kszych ni� podany rozmiar\n"
 
-#: options.c:699
+#: options.c:624
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr "  -w, --warnings    czas mi�dzy powiadomieniami o poczcie\n"
 
-#: options.c:701
+#: options.c:626
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr ""
 "  -S, --smtphost    okre�la nazw� hosta SMTP przesy�aj�cego nasze listy\n"
 
-#: options.c:702
+#: options.c:627
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains pobiera poczt� dla podanych domen\n"
 
-#: options.c:703
+#: options.c:628
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 "  -D, --smtpaddress okre�la nazw� domeny SMTP u�ywan� przy dor�czaniu "
 "poczty\n"
 
-#: options.c:704
+#: options.c:629
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr "      --smtpname    ustawia pe�n� nazw� SMTP username@domain\n"
 
-#: options.c:705
+#: options.c:630
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr "  -Z, --antispam    okre�la odpowiedzi blokad antyspamowych\n"
 
-#: options.c:706
+#: options.c:631
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  okre�la limit list�w wys�anych w jednym po��czeniu SMTP\n"
 
-#: options.c:707
+#: options.c:632
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  okre�la limit list�w pobieranych w jednym po��czeniu\n"
 
-#: options.c:708
+#: options.c:633
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr "      --fetchsizelimit ustawia limit wielko�ci �ci�ganego listu\n"
 
-#: options.c:709
+#: options.c:634
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    wykonuje binarne poszukiwanie UIDL-i\n"
 
-#: options.c:710
+#: options.c:635
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr ""
 "  -e, --expunge     liczba skasowanych list�w mi�dzy czyszczeniem skrzynki\n"
 
-#: options.c:711
+#: options.c:636
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr ""
 "  -m, --mda         okre�la �cie�k� do MDA dor�czaj�cego pobrane listy\n"
 
-#: options.c:712
+#: options.c:637
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       okre�la nazw� wynikowego pliku BSMTP\n"
 
-#: options.c:713
+#: options.c:638
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        u�ywa LMTP (RFC2033) do dor�czania poczty\n"
 
-#: options.c:714
+#: options.c:639
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      okre�la nazw� skrzynki na serwerze\n"
 
-#: options.c:715
+#: options.c:640
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    pokazuje kropki oznaczaj�ce post�p tak�e w logach\n"
@@ -2234,7 +2238,7 @@ msgstr "opcja serwera po opcjach u
 msgid "SDPS not enabled."
 msgstr "SDPS nie w��czone."
 
-#: rcfile_y.y:206
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2242,7 +2246,7 @@ msgstr ""
 "fetchmail: opcja interface jest obs�ugiwana tylko pod Linuksem (bez IPv6) i "
 "FreeBSD\n"
 
-#: rcfile_y.y:213
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2250,25 +2254,25 @@ msgstr ""
 "fetchmail: opcja monitor jest obs�ugiwana tylko pod Linuksem (bez IPv6) i "
 "FreeBSD\n"
 
-#: rcfile_y.y:326
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr "SSL nie jest w��czone."
 
-#: rcfile_y.y:375
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr "koniec wej�cia"
 
-#: rcfile_y.y:412
+#: rcfile_y.y:418
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "Plik %s musi by� zwyk�ym plikiem.\n"
 
-#: rcfile_y.y:422
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "Plik %s nie mo�e mie� uprawnie� wi�kszych ni� -rwx--x--- (0710).\n"
 
-#: rcfile_y.y:434
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "Plik %s musi by� w�asno�ci� u�ytkownika.\n"
@@ -2468,11 +2472,21 @@ msgstr "MD5 zastosowany do bloku danych:\n"
 msgid "MD5 result is: \n"
 msgstr "Wynik MD5: \n"
 
-#: servport.c:73
-#, c-format
-msgid ""
-"Cannot resolve service %s to port.  Please specify the service as decimal "
-"port number.\n"
+#: servport.c:52
+#, fuzzy, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr "fetchmail: b��d getaddrinfo(\"%s\",\"%s\"): %s\n"
+
+#: servport.c:78
+#, fuzzy, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+"Nie mo�na rozwi�za� us�ugi %s na port. Prosz� poda� us�ug� jako dziesi�tny "
+"numer portu.\n"
+
+#: servport.c:79
+#, fuzzy
+msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 "Nie mo�na rozwi�za� us�ugi %s na port. Prosz� poda� us�ug� jako dziesi�tny "
 "numer portu.\n"
@@ -2644,117 +2658,121 @@ msgid "execvp(%s) failed\n"
 msgstr "b��d execvp(%s)\n"
 
 #: socket.c:281
-#, c-format
-msgid "fetchmail: getaddrinfo(\"%s\",\"%s\") error: %s\n"
+#, fuzzy, c-format
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "fetchmail: b��d getaddrinfo(\"%s\",\"%s\"): %s\n"
 
-#: socket.c:624
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
+
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "Organizacja wystawcy: %s\n"
 
-#: socket.c:626
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "Uwaga: nazwa Organizacji wystawcy za d�uga (prawdopodobnie uci�ta).\n"
 
-#: socket.c:628
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr "Nieznana organizacja\n"
 
-#: socket.c:630
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "CommonName wystawcy: %s\n"
 
-#: socket.c:632
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "Uwaga: CommonName wystawcy za d�ugie (prawdopodobnie uci�te).\n"
 
-#: socket.c:634
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr "Nieznane CommonName wystawcy\n"
 
-#: socket.c:638
+#: socket.c:640
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "CommonName serwera: %s\n"
 
-#: socket.c:642
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "B��dny certyfikat: za d�ugie CommonName podmiotu!\n"
 
-#: socket.c:658
+#: socket.c:660
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "Niezgodno�� CommonName serwera: %s != %s\n"
 
-#: socket.c:664
+#: socket.c:666
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "Nazwa serwera nie ustawiona, nie mo�na sprawdzi� certyfikatu!\n"
 
-#: socket.c:669
+#: socket.c:671
 msgid "Unknown Server CommonName\n"
 msgstr "Nieznane CommonName serwera\n"
 
-#: socket.c:671
+#: socket.c:673
 msgid "Server name not specified in certificate!\n"
 msgstr "Nazwa serwera nie podana w certyfikacie!\n"
 
-#: socket.c:681
+#: socket.c:683
 msgid "EVP_md5() failed!\n"
 msgstr "b��d EVP_md5()!\n"
 
-#: socket.c:685
+#: socket.c:687
 msgid "Out of memory!\n"
 msgstr "Brak pami�ci!\n"
 
-#: socket.c:693
+#: socket.c:695
 msgid "Digest text buffer too small!\n"
 msgstr "Bufor skr�tu tekstu za ma�y!\n"
 
-#: socket.c:699
+#: socket.c:701
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "Odcisk klucza %s: %s\n"
 
-#: socket.c:703
+#: socket.c:705
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s odcisk�w si� zgadza.\n"
 
-#: socket.c:706
+#: socket.c:708
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s odcisk�w si� nie zgadza!\n"
 
-#: socket.c:715
+#: socket.c:717
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "B��d weryfikacji certyfikatu serwera: %s\n"
 
-#: socket.c:721
+#: socket.c:723
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "nieznany wystawca (pierwsze %d znak�w): %s\n"
 
-#: socket.c:773
+#: socket.c:775
 msgid "File descriptor out of range for SSL"
 msgstr "Deskryptor pliku poza zakresem dla SSL"
 
-#: socket.c:790
+#: socket.c:792
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "Podano b��dny protok� SSL `%s', u�ywam domy�lnego (SSLv23).\n"
 
-#: socket.c:851
+#: socket.c:853
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "Weryfikacja certyfikatu/odcisku klucza z jakiego� powodu pomini�ta!\n"
 
-#: socket.c:923
+#: socket.c:925
 msgid "Cygwin socket read retry\n"
 msgstr "Powt�rzenie odczytu z gniazda cygwinowego\n"
 
-#: socket.c:926
+#: socket.c:928
 msgid "Cygwin socket read retry failed!\n"
 msgstr "Powt�rzenie odczytu z gniazda cygwinowego nie powiod�o si�!\n"
 
@@ -2796,50 +2814,50 @@ msgstr "nie znalaz
 msgid "found Received address `%s'\n"
 msgstr "znalaz�em adres Received `%s'\n"
 
-#: transact.c:530
+#: transact.c:532
 msgid "message delimiter found while scanning headers\n"
 msgstr "podczas skanowania nag��wk�w znaleziono separator list�w\n"
 
-#: transact.c:551
+#: transact.c:553
 msgid "incorrect header line found while scanning headers\n"
 msgstr "podczas skanowania nag��wk�w znaleziono b��dn� lini� nag��wka\n"
 
-#: transact.c:553
+#: transact.c:555
 #, c-format
 msgid "line: %s"
 msgstr "linia: %s"
 
-#: transact.c:1067
+#: transact.c:1076
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "brak pasuj�cych lokalnych adres�w, przesy�am do %s\n"
 
-#: transact.c:1082
+#: transact.c:1091
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "listy nie zostan� przes�ane i skasowane z powodu b��d�w DNS-u\n"
 
-#: transact.c:1194
+#: transact.c:1203
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "zapisuj� RFC822 msgblk.headers\n"
 
-#: transact.c:1215
+#: transact.c:1224
 msgid "no recipient addresses matched declared local names"
 msgstr "�aden z adresat�w nie pasowa� do nazw lokalnych u�ytkownik�w"
 
-#: transact.c:1222
+#: transact.c:1231
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "adresat %s nie pasowa� do �adnej nazwy lokalnego u�ytkownika"
 
-#: transact.c:1231
+#: transact.c:1240
 msgid "message has embedded NULs"
 msgstr "list zawiera� znaki NULL"
 
-#: transact.c:1239
+#: transact.c:1248
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "demon SMTP odrzuci� adresy lokalnych odbiorc�w: '"
 
-#: transact.c:1367
+#: transact.c:1376
 msgid "writing message text\n"
 msgstr "zapisuj� tre�� listu\n"
 
@@ -2915,3 +2933,6 @@ msgstr "b
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "b��d realloc\n"
+
+#~ msgid "Received"
+#~ msgstr "Received"
diff --git a/po/ru.po b/po/ru.po
index fd597144..4e010ff5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2005-09-21 10:45+0200\n"
+"POT-Creation-Date: 2005-09-25 13:01+0200\n"
 "PO-Revision-Date: 2005-09-19 19:14+0300\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -386,7 +386,7 @@ msgstr "
 msgid "%s at %s (folder %s)"
 msgstr "%s �� %s (������� %s)"
 
-#: driver.c:1314 rcfile_y.y:374
+#: driver.c:1314 rcfile_y.y:380
 #, c-format
 msgid "%s at %s"
 msgstr "%s �� %s"
@@ -888,13 +888,15 @@ msgstr ""
 "������������ �����������!\n"
 
 #: fetchmail.c:1185
-#, c-format
-msgid "%s configuration invalid, port number cannot be negative\n"
+#, fuzzy, c-format
+msgid ""
+"fetchmail: %s configuration invalid, specify positive port number for "
+"service or port\n"
 msgstr "������������ %s �� �����, ����� ����� �� ����� ���� �������������\n"
 
 #: fetchmail.c:1192
-#, c-format
-msgid "%s configuration invalid, RPOP requires a privileged port\n"
+#, fuzzy, c-format
+msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "������������ %s �� �����, ��� RPOP ��������� ����������������� ����\n"
 
 #: fetchmail.c:1210
@@ -1438,13 +1440,9 @@ msgstr "  
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  ������������ ��������� ������ ����: %s\n"
 
-#: fetchmail.c:1788
-msgid "Received"
-msgstr "Received"
-
 #: fetchmail.c:1790
-#, c-format
-msgid "  Number of envelope header to be parsed: %d\n"
+#, fuzzy, c-format
+msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  ���������� ������������ ���������� ��� ��������: %d\n"
 
 #: fetchmail.c:1793
@@ -1870,80 +1868,80 @@ msgstr "
 msgid "Secret pass phrase: "
 msgstr "��������� ����������������� �����:"
 
-#: options.c:201 options.c:245
+#: options.c:161 options.c:205
 #, c-format
 msgid "String '%s' is not a valid number string.\n"
 msgstr "������ '%s' �� �������� ������ �������� �������.\n"
 
-#: options.c:210
+#: options.c:170
 #, c-format
 msgid "Value of string '%s' is %s than %d.\n"
 msgstr "�������� ������ '%s' - %s, ��� %d.\n"
 
-#: options.c:211
+#: options.c:171
 msgid "smaller"
 msgstr "������"
 
-#: options.c:211
+#: options.c:171
 msgid "larger"
 msgstr "������"
 
-#: options.c:380
+#: options.c:329
 #, c-format
 msgid "Invalid protocol `%s' specified.\n"
 msgstr "������ �������� �������� `%s'.\n"
 
-#: options.c:424
+#: options.c:371
 #, c-format
 msgid "Invalid authentication `%s' specified.\n"
 msgstr "������� �������� �������������� `%s'.\n"
 
-#: options.c:648
+#: options.c:572
 msgid "usage:  fetchmail [options] [server ...]\n"
 msgstr "�������������:  fetchmail [�����] [������ ...]\n"
 
-#: options.c:649
+#: options.c:573
 msgid "  Options are as follows:\n"
 msgstr "  ������������ �����:\n"
 
-#: options.c:650
+#: options.c:574
 msgid "  -?, --help        display this option help\n"
 msgstr "  -?, --help        ����� ���� �������\n"
 
-#: options.c:651
+#: options.c:575
 msgid "  -V, --version     display version info\n"
 msgstr "  -V, --version     ����� ���������� � ������\n"
 
-#: options.c:653
+#: options.c:577
 msgid "  -c, --check       check for messages without fetching\n"
 msgstr "  -c, --check       �������� ��������� ��� �������\n"
 
-#: options.c:654
+#: options.c:578
 msgid "  -s, --silent      work silently\n"
 msgstr "  -s, --silent      ������ ��� ������ ����������\n"
 
-#: options.c:655
+#: options.c:579
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
 msgstr ""
 "  -v, --verbose     ������ � ��������� ������� ��������������� ������\n"
 
-#: options.c:656
+#: options.c:580
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
 msgstr "  -d, --daemon      ������ � ���� ������ ������ n ������\n"
 
-#: options.c:657
+#: options.c:581
 msgid "  -N, --nodetach    don't detach daemon process\n"
 msgstr "  -N, --nodetach    �� ����������� ������� ������\n"
 
-#: options.c:658
+#: options.c:582
 msgid "  -q, --quit        kill daemon process\n"
 msgstr "  -q, --quit        ������� �������� ������\n"
 
-#: options.c:659
+#: options.c:583
 msgid "  -L, --logfile     specify logfile name\n"
 msgstr "  -L, --logfile     �������� ����� log-�����\n"
 
-#: options.c:660
+#: options.c:584
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
@@ -1951,52 +1949,52 @@ msgstr ""
 "      --syslog      ������������� syslog(3) ��� ����������� ���������, ����� "
 "������� ��� �����\n"
 
-#: options.c:661
+#: options.c:585
 msgid "      --invisible   don't write Received & enable host spoofing\n"
 msgstr "      --invisible   �� ���������� Received � �������� ������� �����\n"
 
-#: options.c:662
+#: options.c:586
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
 msgstr "  -f, --fetchmailrc �������� ������� ����� �������� �������\n"
 
-#: options.c:663
+#: options.c:587
 msgid "  -i, --idfile      specify alternate UIDs file\n"
 msgstr "  -i, --idfile      �������� ������ UID'�� �����\n"
 
-#: options.c:664
+#: options.c:588
 msgid "      --postmaster  specify recipient of last resort\n"
 msgstr "      --postmaster  �������� ���������� �� ������� ������\n"
 
-#: options.c:665
+#: options.c:589
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
 msgstr ""
 "      --nobounce    ��������������� ��������� ������������� � �����������.\n"
 
-#: options.c:667
+#: options.c:591
 msgid "  -I, --interface   interface required specification\n"
 msgstr "  -I, --interface   ��������� ��� ���������� ������������\n"
 
-#: options.c:668
+#: options.c:592
 msgid "  -M, --monitor     monitor interface for activity\n"
 msgstr "  -M, --monitor     ���������� �� ����������� ����������\n"
 
-#: options.c:671
+#: options.c:595
 msgid "      --ssl         enable ssl encrypted session\n"
 msgstr "      --ssl         ��������� ������, ������������� ssl\n"
 
-#: options.c:672
+#: options.c:596
 msgid "      --sslkey      ssl private key file\n"
 msgstr "      --sslkey      ���� ���������� ����� ssl\n"
 
-#: options.c:673
+#: options.c:597
 msgid "      --sslcert     ssl client certificate\n"
 msgstr "      --sslcert     ���������� ������� ssl\n"
 
-#: options.c:674
+#: options.c:598
 msgid "      --sslcertpath path to ssl certificates\n"
 msgstr "      --sslcertpath ���� � ������������ ssl\n"
 
-#: options.c:675
+#: options.c:599
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
@@ -2004,163 +2002,169 @@ msgstr ""
 "      --sslfingerprint ���������, ������� ������ ��������������� ����������� "
 "�������.\n"
 
-#: options.c:676
+#: options.c:600
 msgid "      --sslproto    force ssl protocol (ssl2/ssl3/tls1)\n"
 msgstr ""
 "      --sslproto    �������������� ������������� ��������� ssl (ssl2/ssl3/"
 "tls1)\n"
 
-#: options.c:678
+#: options.c:602
 msgid "      --plugin      specify external command to open connection\n"
 msgstr ""
 "      --plugin      �������� ������� ������� ��� ��������� ����������\n"
 
-#: options.c:679
+#: options.c:603
 msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr ""
 "      --plugout     �������� ������� ������� ��� ��������� ���������� smtp\n"
 
-#: options.c:681
+#: options.c:605
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
 msgstr "  -p, --protocol    �������� ��������� ������ (��. man page)\n"
 
-#: options.c:682
+#: options.c:606
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
 msgstr ""
 "  -U, --uidl        �������������� ������������� UIDL'�� (������ pop3)\n"
 
-#: options.c:683
-msgid "  -P, --port        TCP/IP service port to connect to\n"
+#: options.c:607
+#, fuzzy
+msgid "  -P, --port        TCP port to connect to (obsolete, use --service)\n"
 msgstr "  -P, --port        ���� ������ TCP/IP ��� �����������\n"
 
-#: options.c:684
+#: options.c:608
+msgid ""
+"      --service     TCP service to connect to (can be numeric TCP port)\n"
+msgstr ""
+
+#: options.c:609
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
 msgstr "      --auth        ��� �������������� (password/kerberos/ssh/otp)\n"
 
-#: options.c:685
+#: options.c:610
 msgid "  -t, --timeout     server nonresponse timeout\n"
 msgstr "  -t, --timeout     ������� �������� �������\n"
 
-#: options.c:686
+#: options.c:611
 msgid "  -E, --envelope    envelope address header\n"
 msgstr "  -E, --envelope    ��������� ������������� ������\n"
 
-#: options.c:687
+#: options.c:612
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
 msgstr "  -Q, --qvirtual    �������, ��������� �� id ���������� ������������\n"
 
-#: options.c:688
+#: options.c:613
 msgid "      --principal   mail service principal\n"
 msgstr "      --principal   ��������� �������� ������\n"
 
-#: options.c:689
+#: options.c:614
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
 msgstr ""
 "      --tracepolls  ���������� ���������� ����������� ������ � ��������� "
 "Received\n"
 
-#: options.c:691
+#: options.c:616
 msgid "  -u, --username    specify users's login on server\n"
 msgstr "  -u, --username    �������� ������ ������������ �� �������\n"
 
-#: options.c:692
+#: options.c:617
 msgid "  -a, --all         retrieve old and new messages\n"
 msgstr "  -a, --all         ��������� ������ � ����� ���������\n"
 
-#: options.c:693
+#: options.c:618
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
 msgstr "  -K, --nokeep      �������� ����� ��������� ����� ���������\n"
 
-#: options.c:694
+#: options.c:619
 msgid "  -k, --keep        save new messages after retrieval\n"
 msgstr "  -k, --keep        ���������� ����� ��������� ����� ���������\n"
 
-#: options.c:695
+#: options.c:620
 msgid "  -F, --flush       delete old messages from server\n"
 msgstr "  -F, --flush       �������� ������ ��������� � �������\n"
 
-#: options.c:696
+#: options.c:621
 msgid "      --limitflush  delete oversized messages\n"
 msgstr "      --limitflush  �������� ��������� ����������� �������\n"
 
-#: options.c:697
+#: options.c:622
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
 msgstr "  -n, --norewrite   �� �������������� ������ ���������\n"
 
-#: options.c:698
+#: options.c:623
 msgid "  -l, --limit       don't fetch messages over given size\n"
 msgstr ""
 "  -l, --limit       �� ������ ������� ��������� ������ ��������� �������\n"
 
-#: options.c:699
+#: options.c:624
 msgid "  -w, --warnings    interval between warning mail notification\n"
 msgstr ""
 "  -w, --warnings    ���������� ����� ���������������� ��������� "
 "�������������\n"
 
-#: options.c:701
+#: options.c:626
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
 msgstr "  -S, --smtphost    ��������� ����� ������������� SMTP\n"
 
-#: options.c:702
+#: options.c:627
 msgid "      --fetchdomains fetch mail for specified domains\n"
 msgstr "      --fetchdomains ������� ����� ��� ��������� �������\n"
 
-#: options.c:703
+#: options.c:628
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
 msgstr ""
 "  -D, --smtpaddress ��������� ������, ������������� ��� �������� SMTP\n"
 
-#: options.c:704
+#: options.c:629
 msgid "      --smtpname    set SMTP full name username@domain\n"
 msgstr ""
 "      --smtpname    ��������� ������� (������������@�����) ����� SMTP\n"
 
-#: options.c:705
+#: options.c:630
 msgid "  -Z, --antispam,   set antispam response values\n"
 msgstr ""
 "  -Z, --antispam,   ��������� �������� �������������� �������� ��������\n"
 
-#: options.c:706
+#: options.c:631
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
 msgstr ""
 "  -b, --batchlimit  ��������� ����������� �� ����� ��� SMTP-����������\n"
 
-#: options.c:707
+#: options.c:632
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
 msgstr ""
 "  -B, --fetchlimit  ��������� ����������� �� ������� ��� ���������� �������\n"
 
-#: options.c:708
+#: options.c:633
 msgid "      --fetchsizelimit set fetch message size limit\n"
 msgstr ""
 "      --fetchsizelimit ��������� ����������� �� ������ ������� ���������\n"
 
-#: options.c:709
+#: options.c:634
 msgid "      --fastuidl    do a binary search for UIDLs\n"
 msgstr "      --fastuidl    ��������� �������� ����� UIDL'��\n"
 
-#: options.c:710
+#: options.c:635
 msgid "  -e, --expunge     set max deletions between expunges\n"
 msgstr "  -e, --expunge     ��������� ������������� ���������� ��������\n"
 
-#: options.c:711
+#: options.c:636
 msgid "  -m, --mda         set MDA to use for forwarding\n"
 msgstr "  -m, --mda         ��������� MDA, ������������� ��� �������������\n"
 
-#: options.c:712
+#: options.c:637
 msgid "      --bsmtp       set output BSMTP file\n"
 msgstr "      --bsmtp       ��������� ����� ������ BSMTP\n"
 
-#: options.c:713
+#: options.c:638
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
 msgstr "      --lmtp        ������������� ��� �������� LMTP (RFC2033)\n"
 
-#: options.c:714
+#: options.c:639
 msgid "  -r, --folder      specify remote folder name\n"
 msgstr "  -r, --folder      �������� ����� ���������� ��������\n"
 
-#: options.c:715
+#: options.c:640
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    ����������� �������� ������ ��������� ���� � log-������\n"
@@ -2218,7 +2222,7 @@ msgstr "
 msgid "SDPS not enabled."
 msgstr "SDPS �� �������."
 
-#: rcfile_y.y:206
+#: rcfile_y.y:212
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
@@ -2226,32 +2230,32 @@ msgstr ""
 "fetchmail: ����� interface �������������� ������ � Linux (��� IPv6) � "
 "FreeBSD\n"
 
-#: rcfile_y.y:213
+#: rcfile_y.y:219
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr ""
 "fetchmail: ����� monitor �������������� ������ � Linux (��� IPv6) � FreeBSD\n"
 
-#: rcfile_y.y:326
+#: rcfile_y.y:332
 msgid "SSL is not enabled"
 msgstr "SSL �� �������"
 
-#: rcfile_y.y:375
+#: rcfile_y.y:381
 msgid "end of input"
 msgstr "����� �����"
 
-#: rcfile_y.y:412
+#: rcfile_y.y:418
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "���� %s ������ ���� ������� ������.\n"
 
-#: rcfile_y.y:422
+#: rcfile_y.y:428
 #, c-format
 msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
 msgstr "���� %s ������ ����� ���������� -rwx--x--- (0710), �� �� ����� ����.\n"
 
-#: rcfile_y.y:434
+#: rcfile_y.y:440
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "���������� ����� %s ������ ���� ��.\n"
@@ -2451,11 +2455,21 @@ msgstr "MD5 
 msgid "MD5 result is: \n"
 msgstr "��������� MD5: \n"
 
-#: servport.c:73
-#, c-format
-msgid ""
-"Cannot resolve service %s to port.  Please specify the service as decimal "
-"port number.\n"
+#: servport.c:52
+#, fuzzy, c-format
+msgid "getaddrinfo(NULL, \"%s\") error: %s\n"
+msgstr "fetchmail: ������ getaddrinfo(\"%s\",\"%s\"): %s\n"
+
+#: servport.c:78
+#, fuzzy, c-format
+msgid "Cannot resolve service %s to port number.\n"
+msgstr ""
+"���������� ���������� ��� ������ %s �� �����. ����������, ������� ������ � "
+"���� ����������� ������ �����.\n"
+
+#: servport.c:79
+#, fuzzy
+msgid "Please specify the service as decimal port number.\n"
 msgstr ""
 "���������� ���������� ��� ������ %s �� �����. ����������, ������� ������ � "
 "���� ����������� ������ �����.\n"
@@ -2627,122 +2641,126 @@ msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) ���������� ��������\n"
 
 #: socket.c:281
-#, c-format
-msgid "fetchmail: getaddrinfo(\"%s\",\"%s\") error: %s\n"
+#, fuzzy, c-format
+msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "fetchmail: ������ getaddrinfo(\"%s\",\"%s\"): %s\n"
 
-#: socket.c:624
+#: socket.c:284
+msgid "Try adding the --service option (see also FAQ item R12).\n"
+msgstr ""
+
+#: socket.c:626
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "������������� �����������: %s\n"
 
-#: socket.c:626
+#: socket.c:628
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr ""
 "��������������: ��� ������������� ����������� ������� ������� (�������� "
 "���������).\n"
 
-#: socket.c:628
+#: socket.c:630
 msgid "Unknown Organization\n"
 msgstr "����������� �����������\n"
 
-#: socket.c:630
+#: socket.c:632
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "������������ ���: %s\n"
 
-#: socket.c:632
+#: socket.c:634
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr ""
 "��������������: ������������ ��� ������� ������� (�������� ���������).\n"
 
-#: socket.c:634
+#: socket.c:636
 msgid "Unknown Issuer CommonName\n"
 msgstr "����������� ������������ ���\n"
 
-#: socket.c:638
+#: socket.c:640
 #, c-format
 msgid "Server CommonName: %s\n"
 msgstr "������������ ��� �������: %s\n"
 
-#: socket.c:642
+#: socket.c:644
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "������������ ����������: ����� �������� ���� ������� �������!\n"
 
-#: socket.c:658
+#: socket.c:660
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "������������ ������������� ����� �������: %s != %s\n"
 
-#: socket.c:664
+#: socket.c:666
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "��� ������� �� �����������, ���������� ��������� ����������!\n"
 
-#: socket.c:669
+#: socket.c:671
 msgid "Unknown Server CommonName\n"
 msgstr "����������� ������������ ��� �������\n"
 
-#: socket.c:671
+#: socket.c:673
 msgid "Server name not specified in certificate!\n"
 msgstr "��� ������� �� ������� � �����������!\n"
 
-#: socket.c:681
+#: socket.c:683
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() ���������� ��������!\n"
 
-#: socket.c:685
+#: socket.c:687
 msgid "Out of memory!\n"
 msgstr "�������� ������!\n"
 
-#: socket.c:693
+#: socket.c:695
 msgid "Digest text buffer too small!\n"
 msgstr "����� ���������� ������� ������� ���!\n"
 
-#: socket.c:699
+#: socket.c:701
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "��������� ����� %s: %s\n"
 
-#: socket.c:703
+#: socket.c:705
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "��������� %s ���������.\n"
 
-#: socket.c:706
+#: socket.c:708
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "��������� %s �� ���������!\n"
 
-#: socket.c:715
+#: socket.c:717
 #, c-format
 msgid "Server certificate verification error: %s\n"
 msgstr "������ �������� ����������� �������: %s\n"
 
-#: socket.c:721
+#: socket.c:723
 #, c-format
 msgid "unknown issuer (first %d characters): %s\n"
 msgstr "����������� ������������� ������� (������ %d ��������): %s\n"
 
-#: socket.c:773
+#: socket.c:775
 msgid "File descriptor out of range for SSL"
 msgstr "���������� ����� ��� ��������� SSL"
 
-#: socket.c:790
+#: socket.c:792
 #, c-format
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr ""
 "������ �������� �������� SSL '%s', ������������ �������� �� ��������� "
 "(SSLv23).\n"
 
-#: socket.c:851
+#: socket.c:853
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
 msgstr "�������� �����������/��������� ���� ���-�� ���������!\n"
 
-#: socket.c:923
+#: socket.c:925
 msgid "Cygwin socket read retry\n"
 msgstr "��������� ������� ������ ������ Cygwin\n"
 
-#: socket.c:926
+#: socket.c:928
 msgid "Cygwin socket read retry failed!\n"
 msgstr "��������� ������� ������ ������ Cygwin ����������� ��������!\n"
 
@@ -2784,50 +2802,50 @@ msgstr "
 msgid "found Received address `%s'\n"
 msgstr "������ ����� Received `%s'\n"
 
-#: transact.c:530
+#: transact.c:532
 msgid "message delimiter found while scanning headers\n"
 msgstr "��� ������������ ���������� ������ ����������� ���������\n"
 
-#: transact.c:551
+#: transact.c:553
 msgid "incorrect header line found while scanning headers\n"
 msgstr "��� ������������ ���������� ������� �������� ������\n"
 
-#: transact.c:553
+#: transact.c:555
 #, c-format
 msgid "line: %s"
 msgstr "������: %s"
 
-#: transact.c:1067
+#: transact.c:1076
 #, c-format
 msgid "no local matches, forwarding to %s\n"
 msgstr "��� ��������� ����������, ������������������ �� %s\n"
 
-#: transact.c:1082
+#: transact.c:1091
 msgid "forwarding and deletion suppressed due to DNS errors\n"
 msgstr "������������� � �������� �������������� ��-�� ������ DNS\n"
 
-#: transact.c:1194
+#: transact.c:1203
 msgid "writing RFC822 msgblk.headers\n"
 msgstr "������������ ��������� RFC822 msgblk\n"
 
-#: transact.c:1215
+#: transact.c:1224
 msgid "no recipient addresses matched declared local names"
 msgstr "��� ������� �����������, ��������������� ����������� ��������� ������"
 
-#: transact.c:1222
+#: transact.c:1231
 #, c-format
 msgid "recipient address %s didn't match any local name"
 msgstr "����� ���������� %s �� ������������� �� ������ ���������� �����"
 
-#: transact.c:1231
+#: transact.c:1240
 msgid "message has embedded NULs"
 msgstr "��������� �������� ��������� NUL"
 
-#: transact.c:1239
+#: transact.c:1248
 msgid "SMTP listener rejected local recipient addresses: "
 msgstr "��������� SMTP ������ ������ ��������� �����������: "
 
-#: transact.c:1367
+#: transact.c:1376
 msgid "writing message text\n"
 msgstr "������������ ����� ���������\n"
 
@@ -2901,3 +2919,6 @@ msgstr "malloc 
 #: xmalloc.c:47
 msgid "realloc failed\n"
 msgstr "realloc ���������� ��������\n"
+
+#~ msgid "Received"
+#~ msgstr "Received"
-- 
cgit v1.2.3