aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/ca.po215
-rw-r--r--po/da.po215
-rw-r--r--po/el.po213
-rw-r--r--po/en_GB.po218
-rw-r--r--po/es.po215
-rw-r--r--po/fi.po213
-rw-r--r--po/gl.po215
-rw-r--r--po/id.po215
-rw-r--r--po/ja.po228
-rw-r--r--po/nl.po236
-rw-r--r--po/pt_BR.po215
-rw-r--r--po/ru.po215
-rw-r--r--po/sk.po251
-rw-r--r--po/sq.po215
-rw-r--r--po/tr.po215
-rw-r--r--po/vi.po249
-rw-r--r--po/zh_CN.po230
17 files changed, 2066 insertions, 1707 deletions
diff --git a/po/ca.po b/po/ca.po
index 1becab9e..0579adda 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.11\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2009-08-06 14:52+0200\n"
"Last-Translator: Ernest Adrogu Calveras <eadrogue@gmx.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -1690,69 +1690,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "Error %cMTP: %s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "No s'ha pogut obtenir el nom de servei de [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "S'usa el nom de servei [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "Enviant les credencials\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Error en l'intercanvi de credencials\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "No s'ha pogut desajustar el nivell de seguretat de dades\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "S'ha completat l'intercanvi de credencials\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "El servidor requereix integritat i/o privacitat\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Indicadors del nivell de seguretat desajustat: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "La mida mxima del component GSS s %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Error quan es creava la petici del nivell de seguretat\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "Enviant les credencials GSS\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Error quan s'enviaven les credencials GSS\n"
@@ -1792,98 +1792,98 @@ msgstr "S'ha identificat el protocol com a IMAP2 o IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "es far una pausa desprs de l'obtenci\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: la promoci a TLS ha reeixit.\n"
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: la promoci a TLS a fallat.\n"
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: la promoci oportunista a TLS a fallat, intentant continuar.\n"
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Es requereix capacitat per OTP no compilada en el fetchmail\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Es requereix capacitat per NTLM no compilada en el fetchmail\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "El servidor no suporta la capacitat per LOGIN requerida\n"
-#: imap.c:686
+#: imap.c:679
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "recompte de missatges eliminats incorrecte (%d real != %d esperat)\n"
-#: imap.c:825
+#: imap.c:818
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu s no llegit\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u s no llegit\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "la re-obtenci ha fallat\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "hi ha %d missatge esperant desprs de la re-obtenci\n"
msgstr[1] "hi ha %d missatges esperant desprs de la re-obtenci\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "ha fallat la selecci de bstia\n"
-#: imap.c:953
+#: imap.c:946
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "hi ha %d missatge esperant desprs de la primera obtenci\n"
msgstr[1] "hi ha %d missatges esperant desprs de la primera obtenci\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "la supressi de missatges ha fallat\n"
-#: imap.c:971
+#: imap.c:964
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "hi ha %d missatge esperant desprs de la supressi\n"
msgstr[1] "hi ha %d missatges esperant desprs de la supressi\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "la recerca de missatges no llegits ha fallat\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u s el primer missatge no llegit\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
"Atenci: s'ignoren les dades errnies sobre la mida dels missatges enviades "
"pel servidor.\n"
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2082,7 +2082,7 @@ msgstr "recv fatal del servidor\n"
msgid "Could not decode OTP challenge\n"
msgstr "No s'ha pogut desxifrar la codificaci OTP\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Contrasenya secreta: "
@@ -2435,7 +2435,7 @@ msgstr ""
" --showdots mostra punts de progressi dhuc als fitxers de "
"registre\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2443,77 +2443,77 @@ msgstr ""
"Atenci: s'ha detectat un \"Maillennium POP3/PROXY server\", s'usa RETR en "
"lloc de TOP.\n"
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
"Aquesta sessi requereix TLS, per el servidor no admet l'ordre CAPA.\n"
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr "No obstant l'ordre CAPA s necessria per a TLS.\n"
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: la promoci oportunista a TLS a fallat, intentant continuar.\n"
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr "S'han esgotat els autenticadors permesos i no es pot continuar.\n"
# timestamp: marca horria
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "No s'ha trobat l'informaci horria APOP requerida a la salutaci\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "Error de sintaxi en l'informaci horria de la salutaci\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr "Informaci horria APOP errnia.\n"
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Petici de protocol indefinida a POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "bloqueig temporal! Hi ha alguna altra sessi activa?\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "No s'ha pogut administrar la resposta UIDL del servidor remot.\n"
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr "El servidor ha respost amb un UID pel missatge equivocat.\n"
-#: pop3.c:836
+#: pop3.c:831
#, fuzzy, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (nm=%d) s'ha esborrat, per encara est present!\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"Els missatges estan inserits a la llista del servidor. No es pot continuar.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "error de protocol\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "error de protocol quan es rebien els UIDLs\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (nm=%d) s'ha esborrat, per encara est present!\n"
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr "L'opci --folder no est suportada per POP3\n"
@@ -2789,105 +2789,105 @@ msgstr "SMTP: (cos del missatge retornat)\n"
msgid "mail from %s bounced to %s\n"
msgstr "correu de %s retornat a %s\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "L'error desat encara s %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "Error %cMTP: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr "El servidor SMTP requereix STARTTLS, es mant el missatge.\n"
-#: sink.c:745
+#: sink.c:735
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "No s'ha pogut obrir el fitxer BSMTP: %s\n"
-#: sink.c:791
+#: sink.c:781
#, fuzzy, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "No s'ha pogut escriure el prembul del fitxer BSMTP.\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "El receptor %cMTP no admet l'adrea del destinatari `%s'\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "El receptor %cMTP no admet l'adrea de destinaci `%s'\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "cap adrea coincideix; el postmaster no est definit.\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "ni tan sols es pot enviar a %s!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "cap adrea coincideix; reenviant a %s.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "a punt de lliurar amb: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, fuzzy, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr "No s'ha pogut reanomenar el fitxer d'ids %s a %s: %s\n"
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "no s'ha pogut executar l'MDA\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "La connexi %cMTP amb %s ha fallat\n"
# raise
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "no s'ha pogut lliurar via SMTP; recorrent a %s"
-#: sink.c:1383
+#: sink.c:1373
#, fuzzy, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "Ha fallat la terminaci del missatge o el tancament del fitxer BSMTP\n"
-#: sink.c:1408
+#: sink.c:1398
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Error en escriure a l'MDA: %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA finalitzat pel senyal %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "L'MDA ha retornat un estat no nul: %d\n"
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2895,20 +2895,20 @@ msgstr ""
"Estrany: La funci pclose de l'MDA a retornat %d i errno %d/%s, no es pot "
"continuar a %s:%d\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "El receptor SMTP refusa el lliurament\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "Error de lliurament LMTP a EOM\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Resposta no-503 inesperada al final del missatge LMTP: %s\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3194,23 +3194,23 @@ msgstr "Es torna a intentar llegir el socket Cygwin\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "El reintent de llegir el socket Cygwin ha fallat!\n"
-#: transact.c:65
+#: transact.c:71
#, c-format
msgid "mapped address %s to local %s\n"
msgstr "l'adrea %s s'ha assignat al nom local %s\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "%s s'ha assignat al nom local %s\n"
# qu significa?
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "passat per %s encaixa amb %s\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3219,66 +3219,87 @@ msgstr ""
"analitzant la lnea Received:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "lnia acceptada, %s s un lies del servidor de correu\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "lnia rebutjada, %s no s un lies del servidor de correu\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "no s'ha trobat cap adrea a la capalera Received\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "s'ha trobat l'adrea `%s' a la capalera Received\n"
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr "s'ha trobat una lnia incorrecta quan s'analitzava l'encapalament\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "lnia: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"analitzant la lnea Received:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "cap conincidncia local, reenviant a %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "reenviament i eliminaci omesos a causa d'errors de DNS\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "escrivint capaleres msgblk RFC822\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr "cap adrea de destinatari coincideix amb els noms locals declarats"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "l'adrea del destinatari %s no lliga amb cap nom local"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "el missatge cont carcters NUL"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "el receptor SMTP ha rebutjat les adreces locals de destinaci: "
-#: transact.c:1445
+#: transact.c:1473
msgid "error writing message text\n"
msgstr "error en escriure el text del missatge\n"
diff --git a/po/da.po b/po/da.po
index 1440526f..d209d6b2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.2.4\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2003-09-02 20:21+0200\n"
"Last-Translator: Byrial Ole Jensen <byrial@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -1668,69 +1668,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "%cMTP-fejl: %s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "Kunne ikke f servicenavn for [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Bruger servicenavn [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "Sender akkreditiver\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Fejl ved udveksling af akkreditiver\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "Kunne ikke udpakke sikkerhedsniveaudata\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "Akkreditiver udvekslet\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "Server krver integritet og/eller hemmeligholdelse\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Udpakkede sikkerhedsniveauflag: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "Maksimal GSS-symbolstrrelse er %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Fejl ved anmodning af sikkerhedsniveau\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "Frigiver GSS-akkreditiver\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Fejl ved frigivelse af akkreditiver\n"
@@ -1770,96 +1770,96 @@ msgstr "Protokol identificeret som IMAP2 eller IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "gr i tomgang efter prvning\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr ""
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr ""
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Fetchmail er ikke oversat med OTP-evne som pkrvet\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Fetchmail er ikke oversat med NTLM-evne som pkrvet\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "Server understtter ikke den krvede indlogningsmde\n"
-#: imap.c:686
+#: imap.c:679
#, fuzzy, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "brev %s@%s:%d havde ikke den forventede lngde (%d != %d forventet)\n"
-#: imap.c:825
+#: imap.c:818
#, fuzzy, c-format
msgid "%lu is unseen\n"
msgstr "%u er usete\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u er usete\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "genprvning mislykkedes\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, fuzzy, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d breve venter efter genprvning\n"
msgstr[1] "%d breve venter efter genprvning\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "valg af brevbakke mislykkedes\n"
-#: imap.c:953
+#: imap.c:946
#, fuzzy, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d breve venter efter frste prvning\n"
msgstr[1] "%d breve venter efter frste prvning\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "sletning (EXPUNGE) mislykkedes\n"
-#: imap.c:971
+#: imap.c:964
#, fuzzy, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d breve venter efter sletning\n"
msgstr[1] "%d breve venter efter sletning\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "sgning efter usete breve mislykkedes\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u er frste usete\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2056,7 +2056,7 @@ msgstr "fatal fejl ved lsning fra server\n"
msgid "Could not decode OTP challenge\n"
msgstr "Kunne ikke afkode OTP-anrb\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Hemmeligt lsen: "
@@ -2392,80 +2392,80 @@ msgstr " -r, --folder specificer navn p brevbakke p server\n"
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots vis forlbsprikker selv i logfiler\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr ""
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr ""
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr ""
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Pkrvet APOP-tidsstempel ikke fundet i hilsen\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "Syntaksfejl i tidsstempel i hilsen\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr ""
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Udefineret protokolnske i POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "ls optaget! Er et andet opkald aktivt?\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr ""
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr ""
-#: pop3.c:836
+#: pop3.c:831
#, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr ""
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "Breve indsat p serverens liste. Kan ikke hndtere dette.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "protokolfejl\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "protokolfejl ved hentning af UID'er\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr ""
-#: pop3.c:1424
+#: pop3.c:1419
#, fuzzy
msgid "Option --folder is not supported with POP3\n"
msgstr "Tilvalg --remote er ikke understttet med POP3\n"
@@ -2742,123 +2742,123 @@ msgstr "SMTP: (tekst til afvisningsbrev)\n"
msgid "mail from %s bounced to %s\n"
msgstr "afvisning af brev fra %s sendt til %s\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "Gemt fejlkode er stadig %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "%cMTP-fejl: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr ""
-#: sink.c:745
+#: sink.c:735
#, fuzzy, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "BSMTP-fil ben eller skrivning af indledning mislykkedes\n"
-#: sink.c:791
+#: sink.c:781
#, fuzzy, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "BSMTP-fil ben eller skrivning af indledning mislykkedes\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "%cMTP-modtager kan ikke lide modtageradresse '%s'\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "%cMTP-modtager kan virkelig ikke lide modtageradresse '%s'\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "ingen adresser passer; postmester ikke sat.\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "kan ikke engang sende til %s!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "ingen adresse-overensstemmelse; leverer til %s.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "klar til at levere med: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr ""
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "MDA-bning mislykkedes\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "%cMTP-forbindelse til %s mislykkedes\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "kan ikke f kontakt til modtager, bruger i stedet %s"
-#: sink.c:1383
+#: sink.c:1373
#, fuzzy, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "Afslutning af brev eller lukning af BSTMP-fil mislykkedes\n"
-#: sink.c:1408
+#: sink.c:1398
#, fuzzy, c-format
msgid "Error writing to MDA: %s\n"
msgstr "leverer til %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA dde af signal %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA returnerede en ikke-nul status %d\n"
-#: sink.c:1417
+#: sink.c:1407
#, fuzzy, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr "Underligt: MDA pclose returnede %d, kan ikke hndtere det i %s:%d\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "SMTP-modtager afviste levering\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "LMTP-leveringsfejl p EOM\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Uventet ikke-503-svar til LMTP EOM: %s\n"
-#: sink.c:1630
+#: sink.c:1620
#, fuzzy
msgid ""
"-- \n"
@@ -3143,22 +3143,22 @@ msgstr "Forsger igen at lse cygwin-sokkel\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "Forsg p at lse cygwin-sokkel mislykkedes!\n"
-#: transact.c:65
+#: transact.c:71
#, fuzzy, c-format
msgid "mapped address %s to local %s\n"
msgstr "%s svarer til %s lokalt\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "%s svarer til %s lokalt\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "Undersgt %s som passer med %s\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3167,66 +3167,87 @@ msgstr ""
"analyserer Received-linje:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "linjen accepteret, %s er et alias for postserveren\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "linjen afvist, %s er ikke et alias for postserveren\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "ingen \"Received\"-adresse fundet\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "fandt \"Received\"-adresse `%s'\n"
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr "ukorrekt brevhovedlinje fundet under lsningen af brevhovedet\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "Linje: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"analyserer Received-linje:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "ingen lokale overensstemmelser, leverer til %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "levering og sletning undladt pga. DNS-fejl\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "skriver RFC822 msgblk.headers\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr "ingen modtageradresser passer med erklrede lokale navne"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "modtageradresse %s passede ikke med noget lokalt navn"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "brev indeholder NUL-tegn"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP-modtager afviste lokal modtageradresse: "
-#: transact.c:1445
+#: transact.c:1473
#, fuzzy
msgid "error writing message text\n"
msgstr "skriver brevtekst\n"
diff --git a/po/el.po b/po/el.po
index 88bb1daa..f5ccbed8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.2.2\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2003-05-06 01:03+0300\n"
"Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -1696,69 +1696,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "%cMTP : %s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr " [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr " [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr " \n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr " \n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr " \n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr " \n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr " / \n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr " : %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr " GSS %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr " \n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr " GSS\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr " \n"
@@ -1798,98 +1798,98 @@ msgstr " IMAP2 IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr " \n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr ""
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr ""
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr " OTP fetchmail\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr " NTLM fetchmail\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr " LOGIN fetchmail\n"
-#: imap.c:686
+#: imap.c:679
#, fuzzy, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr ""
" %s@%s:%d (%d !=%d "
")\n"
-#: imap.c:825
+#: imap.c:818
#, fuzzy, c-format
msgid "%lu is unseen\n"
msgstr "%u \n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u \n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr " \n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, fuzzy, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d \n"
msgstr[1] "%d \n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr " \n"
-#: imap.c:953
+#: imap.c:946
#, fuzzy, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d \n"
msgstr[1] "%d \n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr " \n"
-#: imap.c:971
+#: imap.c:964
#, fuzzy, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d \n"
msgstr[1] "%d \n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr " \n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u \n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2088,7 +2088,7 @@ msgstr " \n"
msgid "Could not decode OTP challenge\n"
msgstr " OTP\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr " : "
@@ -2431,81 +2431,81 @@ msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
" --showdots \n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr ""
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr ""
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr ""
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr " \n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr " \n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr ""
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr " POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr " ! ;\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr ""
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr ""
-#: pop3.c:836
+#: pop3.c:831
#, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr ""
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
" . .\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr " \n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr " UIDL\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr ""
-#: pop3.c:1424
+#: pop3.c:1419
#, fuzzy
msgid "Option --folder is not supported with POP3\n"
msgstr " --remote POP3\n"
@@ -2781,123 +2781,123 @@ msgstr "SMTP: (bounce-message )\n"
msgid "mail from %s bounced to %s\n"
msgstr " %s %s\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr " %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "%cMTP : %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr ""
-#: sink.c:745
+#: sink.c:735
#, fuzzy, c-format
msgid "BSMTP file open failed: %s\n"
msgstr " BSMTP \n"
-#: sink.c:791
+#: sink.c:781
#, fuzzy, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr " BSMTP \n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr " %cMTP `%s'\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr " %cMTP `%s'\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr " postmaster.\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr " %s!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr " %s.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr " : %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr ""
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr " MDA \n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr " %cMTP %s \n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr " ޷ %s"
-#: sink.c:1383
+#: sink.c:1373
#, fuzzy, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr " BSMTP \n"
-#: sink.c:1408
+#: sink.c:1398
#, fuzzy, c-format
msgid "Error writing to MDA: %s\n"
msgstr " %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr " MDA %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr " MDA - %d\n"
-#: sink.c:1417
+#: sink.c:1407
#, fuzzy, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr ": MDA pclose %d, %s:%d\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr " SMTP \n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr " LMTP EOM\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr " -503 LMTP EOM: %s\n"
-#: sink.c:1630
+#: sink.c:1620
#, fuzzy
msgid ""
"-- \n"
@@ -3183,88 +3183,107 @@ msgstr " Cygwin\n"
msgid "Cygwin socket read retry failed!\n"
msgstr " Cygwin !\n"
-#: transact.c:65
+#: transact.c:71
#, fuzzy, c-format
msgid "mapped address %s to local %s\n"
msgstr " %s %s\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr " %s %s\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr " %s %s\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
"%s"
msgstr " Received:%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr " , %s . \n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr " , %s . \n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr " Received\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr " Received `%s'\n"
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr " \n"
-#: transact.c:597
+#: transact.c:603
#, fuzzy, c-format
msgid "line: %s"
msgstr " %s\n"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr " Received:%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr " , %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr " DNS\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr " RFC822 msgblk.headers\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr " "
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr " %s "
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr " NULs"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr " SMTP : "
-#: transact.c:1445
+#: transact.c:1473
#, fuzzy
msgid "error writing message text\n"
msgstr " \n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 62c559ea..852dfb6a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.5\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2006-11-02 06:58-0000\n"
"Last-Translator: David Lodge <dave@cirt.net>\n"
"Language-Team: English (British) <en_gb@li.org>\n"
@@ -1157,8 +1157,9 @@ msgid " OTP authentication will be forced.\n"
msgstr " OTP authentication will be forced.\n"
#: fetchmail.c:1651
+#, fuzzy
msgid " CRAM-MD5 authentication will be forced.\n"
-msgstr " CRAM-MD5 authentication will be forced.\n"
+msgstr " CRAM-Md5 authentication will be forced.\n"
#: fetchmail.c:1654
msgid " GSSAPI authentication will be forced.\n"
@@ -1628,69 +1629,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "%cMTP error: %s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "Couldn't get service name for [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Using service name [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "Sending credentials\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Error exchanging credentials\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "Couldn't unwrap security level data\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "Credential exchange complete\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "Server requires integrity and/or privacy\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Unwrapped security level flags: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "Maximum GSS token size is %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Error creating security level request\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "Releasing GSS credentials\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Error releasing credentials\n"
@@ -1730,97 +1731,97 @@ msgstr "Protocol identified as IMAP2 or IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "will idle after poll\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, fuzzy, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: opportunistic upgrade to TLS.\n"
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, fuzzy, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: opportunistic upgrade to TLS.\n"
-#: imap.c:477
+#: imap.c:470
#, fuzzy, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: opportunistic upgrade to TLS.\n"
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Required OTP capability not compiled into fetchmail\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Required NTLM capability not compiled into fetchmail\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "Required LOGIN capability not supported by server\n"
-#: imap.c:686
+#: imap.c:679
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "mail expunge mismatch (%d actual != %d expected)\n"
-#: imap.c:825
+#: imap.c:818
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu is unseen\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u is unseen\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "re-poll failed\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d message waiting after re-poll\n"
msgstr[1] "%d messages waiting after re-poll\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "mailbox selection failed\n"
-#: imap.c:953
+#: imap.c:946
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d message waiting after first poll\n"
msgstr[1] "%d messages waiting after first poll\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "expunge failed\n"
-#: imap.c:971
+#: imap.c:964
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d message waiting after expunge\n"
msgstr[1] "%d messages waiting after expunge\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "search for unseen messages failed\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u is first unseen\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2015,7 +2016,7 @@ msgstr "server recv fatal\n"
msgid "Could not decode OTP challenge\n"
msgstr "Could not decode OTP challenge\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Secret pass phrase: "
@@ -2342,7 +2343,7 @@ msgstr " -r, --folder specify remote folder name\n"
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots show progress dots even in logfiles\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2350,74 +2351,74 @@ msgstr ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr ""
-#: pop3.c:496
+#: pop3.c:491
#, fuzzy, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: opportunistic upgrade to TLS.\n"
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr ""
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Required APOP timestamp not found in greeting\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "Timestamp syntax error in greeting\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr ""
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Undefined protocol request in POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "lock busy! Is another session active?\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "Cannot handle UIDL response from upstream server.\n"
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr "Server responded with UID for wrong message.\n"
-#: pop3.c:836
+#: pop3.c:831
#, fuzzy, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) was deleted, but is still present!\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "Messages inserted into list on server. Cannot handle this.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "protocol error\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "protocol error while fetching UIDLs\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) was deleted, but is still present!\n"
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr "Option --folder is not supported with POP3\n"
@@ -2692,124 +2693,124 @@ msgstr "SMTP: (bounce-message body)\n"
msgid "mail from %s bounced to %s\n"
msgstr "mail from %s bounced to %s\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "Saved error is still %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "%cMTP error: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr ""
-#: sink.c:745
+#: sink.c:735
#, fuzzy, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "BSMTP file open or preamble write failed\n"
-#: sink.c:791
+#: sink.c:781
#, fuzzy, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "BSMTP file open or preamble write failed\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "%cMTP listener doesn't like recipient address `%s'\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "%cMTP listener doesn't really like recipient address `%s'\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "no address matches; no postmaster set.\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "can't even send to %s!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "no address matches; forwarding to %s.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "about to deliver with: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, fuzzy, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr "Cannot rename fetchids file %s to %s: %s\n"
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "MDA open failed\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "%cMTP connect to %s failed\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "can't raise the listener; falling back to %s"
-#: sink.c:1383
+#: sink.c:1373
#, fuzzy, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "Message termination or close of BSMTP file failed\n"
-#: sink.c:1408
+#: sink.c:1398
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Error writing to MDA: %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA died of signal %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA returned nonzero status %d\n"
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "SMTP listener refused delivery\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "LMTP delivery error on EOM\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Unexpected non-503 response to LMTP EOM: %s\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3089,22 +3090,22 @@ msgstr "Cygwin socket read retry\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "Cygwin socket read retry failed!\n"
-#: transact.c:65
+#: transact.c:71
#, c-format
msgid "mapped address %s to local %s\n"
msgstr "mapped address %s to local %s\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "mapped %s to local %s\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "passed through %s matching %s\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3113,66 +3114,87 @@ msgstr ""
"analyzing Received line:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "line accepted, %s is an alias of the mailserver\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "line rejected, %s is not an alias of the mailserver\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "no Received address found\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "found Received address `%s'\n"
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr "incorrect header line found while scanning headers\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "line: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"analyzing Received line:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "no local matches, forwarding to %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "forwarding and deletion suppressed due to DNS errors\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "writing RFC822 msgblk.headers\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr "no recipient addresses matched declared local names"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "recipient address %s didn't match any local name"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "message has embedded NULs"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP listener rejected local recipient addresses: "
-#: transact.c:1445
+#: transact.c:1473
msgid "error writing message text\n"
msgstr "error writing message text\n"
diff --git a/po/es.po b/po/es.po
index 9246ab59..79979751 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.12\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2009-10-06 19:04+0200\n"
"Last-Translator: Francisco Molinero <paco@byasl.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -1711,69 +1711,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "Error de %cMTP: %s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "No fue posible obtener el nombre de servicio para [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Usando nombre de servicio [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "Enviando credenciales\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Error intercambiando credenciales\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "No fue posible desenvolver los datos del nivel de seguridad\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "Intercambio de credenciales completo\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "El servidor requiere integridad o privacidad\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Opciones de nivel de seguridad desenvueltas: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "El máximo tamaño del componente GSS es %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Error creando petición de nivel de seguridad\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "Liberando las credenciales GSS\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Error liberando las credenciales\n"
@@ -1813,98 +1813,98 @@ msgstr "Protocolo identificado como IMAP2 o IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "descansará después de consultar\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: actualización a TLS correcta.\n"
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: falló la actualización a TLS.\n"
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: falló la actualización oportunista a TLS, intentando continuar\n"
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "La capacidad OTP requerida no se compiló en fetchmail\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "La capacidad NTLM requerida no se compiló en fetchmail\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "La capacidad LOGIN requerida no está permitida por el servidor\n"
-#: imap.c:686
+#: imap.c:679
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "la eliminación de correo no coincide (%d actual != %d esperado)\n"
-#: imap.c:825
+#: imap.c:818
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu no fue visto\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u no fue visto\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "falló el reintento de consulta\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "Queda %d mensaje esperando tras reintentar la consulta\n"
msgstr[1] "Quedan %d mensajes esperando tras reintentar la consulta\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "falló la selección de casilla\n"
-#: imap.c:953
+#: imap.c:946
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "Queda %d mensaje esperando tras la consulta inicial\n"
msgstr[1] "Quedan %d mensajes esperando tras la consulta inicial\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "falló la eliminación\n"
-#: imap.c:971
+#: imap.c:964
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "Queda %d mensaje esperando tras la eliminación\n"
msgstr[1] "Quedan %d mensajes esperando tras la eliminación\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "la búsqueda de mensajes no vistos falló\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u es el primero que no fue visto\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
"Aviso: ignorando datos de errores para los tamaños de mensaje devueltos por "
"el servidor.\n"
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2101,7 +2101,7 @@ msgstr "fatal recv del servidor\n"
msgid "Could not decode OTP challenge\n"
msgstr "No fue posible decodificar el desafío OTP\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Frase clave secreta: "
@@ -2463,7 +2463,7 @@ msgstr ""
" --showdots mostrar puntos de progreso incluso en los archivos de "
"registro\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2471,76 +2471,76 @@ msgstr ""
"Aviso: «Servidor Maillennium POP3/PROXYr» encontrado. use la orden RETR en "
"vez de TOP.\n"
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
"TLS es obligatorio para esta sesión, pero el servidor rechaza la orden CAPA\n"
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr "La orden CAPA, no obstante, es necesaria para TLS.\n"
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: la actualización oportunista a TLS falló, intentando continuar.\n"
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr "Hemos agotado los autenticadores permitidos y no puede continuar.\n"
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "El sello de tiempo APOP requerido no se ha encontrada en el saludo\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "Error de sintaxis en el sello de tiempo en el saludo\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr "Sello de tiempo APOP inválido.\n"
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Petición de protocolo indefinido en POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "¡bloqueo ocupado! ¿Hay otra sesión activa?\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "No se puede manejar la respuesta UIDL proveniente del servidor.\n"
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr "El servidor devolvió el UID de un mensaje incorrecto.\n"
-#: pop3.c:836
+#: pop3.c:831
#, fuzzy, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"Mensajes insertados en una lista en el servidor. No se puede manejar esto.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "error de protocolo\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "error de protocolo durante la recepción de UIDL\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n"
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr "La opción --folder no está permitida con POP3\n"
@@ -2815,125 +2815,125 @@ msgstr "SMTP: (cuerpo de mensaje de rebote)\n"
msgid "mail from %s bounced to %s\n"
msgstr "correo de %s rebotado a %s\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "El error guardado es aún %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "Error de %cMTP: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr "El servidor SMTP necesita STARTTLS, manteniendo mensaje.\n"
-#: sink.c:745
+#: sink.c:735
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "Fallo en la apertura del archivo de BSMTP: %s\n"
-#: sink.c:791
+#: sink.c:781
#, fuzzy, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "Fallo en la escritura del preámbulo\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "Al servidor %cMTP no le gusta la dirección de recipiente «%s»\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr ""
"Al servidor %cMTP realmente no le gusta la dirección de recipiente «%s»\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "no hay direcciones coincidentes; no se configuró un postmaster.\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "¡ni siquiera es posible enviar a %s!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "no hay direcciones coincidentes; reenviando a %s.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "a punto de entregar con: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, fuzzy, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr "No se puede renombrar el archivo fetchids %s a %s: %s\n"
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "Fallo en la apertura de MDA\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "Fallo en la conexión de %cMTP a %s\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "no se puede despertar al servidor; recurriendo a %s"
-#: sink.c:1383
+#: sink.c:1373
#, fuzzy, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "Fallo la terminación del mensaje o el cerrado de BSMTP\n"
-#: sink.c:1408
+#: sink.c:1398
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Error escribiendo a MDA: %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA murió por la señal %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA devolvió un estado %d distinto de cero\n"
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr ""
"Extraño: MDA pclose devolvió %d y errno %d/%s, no se puede manejar en %s:%d\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "El servidor SMTP rechazó la entrega\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "Error de entrega de LMTP en EOM\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Respuesta diferente a 503 no esperada a LMTP EOM: %s\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3223,22 +3223,22 @@ msgstr "Reintento de lectura del zócalo cygwin\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "¡Falló el reintento de lectura del zócalo cygwin\n"
-#: transact.c:65
+#: transact.c:71
#, c-format
msgid "mapped address %s to local %s\n"
msgstr "dirección %s asignada al %s local\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "%s asignado al %s local\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "se atravesó %s coincidiendo con %s\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3247,68 +3247,89 @@ msgstr ""
"analizando línea «Received»:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "línea aceptada, %s es un alias del servidor de correo\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "línea rechazada, %s no es un alias del servidor de correo\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "no se encontró la dirección de «Received»\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "se encontró la dirección de «Received» «%s»\n"
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr ""
"encabezado incorrecto encontrado durante la exploración de encabezados\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "línea: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"analizando línea «Received»:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "no hay coincidencias locales, reenviado a %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "reenvío y borrado suprimido debido a errores de DNS\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "escribiendo encabezados RFC822\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr ""
"ninguna dirección de destino coincidió con los nombres locales declarados"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "la dirección de destino %s no coincide con ningún nombre local"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "el mensaje contiene NULs"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "El servidor SMTP rechazó las direcciones locales de destino: "
-#: transact.c:1445
+#: transact.c:1473
msgid "error writing message text\n"
msgstr "error al escribir el texto del mensaje\n"
diff --git a/po/fi.po b/po/fi.po
index 3cab584a..c99ce695 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.8\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2007-11-06 01:17+0200\n"
"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -1590,69 +1590,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr ""
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr ""
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr ""
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr ""
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr ""
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr ""
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr ""
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr ""
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr ""
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr ""
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr ""
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr ""
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr ""
@@ -1692,97 +1692,97 @@ msgstr ""
msgid "will idle after poll\n"
msgstr ""
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr ""
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr ""
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr ""
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr ""
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr ""
-#: imap.c:686
+#: imap.c:679
#, fuzzy, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr ""
"viesti %s@%s:%d ei ollut odotetun pituinen (%d todellinen ≠ %d odotettu)\n"
-#: imap.c:825
+#: imap.c:818
#, c-format
msgid "%lu is unseen\n"
msgstr ""
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr ""
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr ""
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d viesti odottamassa uudelleennoudon jälkeen\n"
msgstr[1] "%d viestiä odottamassa uudelleennoudon jälkeen\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "postilaatikon valinta epäonnistui\n"
-#: imap.c:953
+#: imap.c:946
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d viesti odottamassa ensimmäisen noudon jälkeen\n"
msgstr[1] "%d viestiä odottamassa ensimmäisen noudon jälkeen\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr ""
-#: imap.c:971
+#: imap.c:964
#, fuzzy, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d viestiä odottamassa uudelleennoutoa\n"
msgstr[1] "%d viestiä odottamassa uudelleennoutoa\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr ""
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr ""
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -1978,7 +1978,7 @@ msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr ""
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr ""
@@ -2303,80 +2303,80 @@ msgstr ""
msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr ""
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr ""
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr ""
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr ""
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr ""
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr ""
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr ""
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr ""
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr ""
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr ""
-#: pop3.c:836
+#: pop3.c:831
#, fuzzy, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) poistettiin, mutta on edelleen olemassa!\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "yhteyskäytäntövirhe\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr ""
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) poistettiin, mutta on edelleen olemassa!\n"
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr ""
@@ -2647,123 +2647,123 @@ msgstr ""
msgid "mail from %s bounced to %s\n"
msgstr ""
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr ""
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr ""
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr ""
-#: sink.c:745
+#: sink.c:735
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr ""
-#: sink.c:791
+#: sink.c:781
#, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr ""
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr ""
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr ""
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr ""
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr ""
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr ""
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr ""
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr ""
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr ""
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr ""
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr ""
-#: sink.c:1383
+#: sink.c:1373
#, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr ""
-#: sink.c:1408
+#: sink.c:1398
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr ""
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr ""
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr ""
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr ""
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr ""
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr ""
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr ""
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3040,87 +3040,106 @@ msgstr ""
msgid "Cygwin socket read retry failed!\n"
msgstr ""
-#: transact.c:65
+#: transact.c:71
#, c-format
msgid "mapped address %s to local %s\n"
msgstr ""
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr ""
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr ""
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
"%s"
msgstr ""
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr ""
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr ""
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr ""
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr ""
-#: transact.c:595
+#: transact.c:601
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr ""
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "rivi: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr ""
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr ""
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr ""
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr ""
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr ""
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr ""
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr ""
-#: transact.c:1445
+#: transact.c:1473
#, fuzzy
msgid "error writing message text\n"
msgstr "kirjoitetaan viestin tekstiä\n"
diff --git a/po/gl.po b/po/gl.po
index ffa51f19..eeb67349 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 5.3.6\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2000-04-10 01:26+0200\n"
"Last-Translator: Jess Bravo lvarez <jba@pobox.com>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -1695,69 +1695,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "erro de %cMTP: %s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "Non se puido obte-lo nome do servicio para [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Usando o nome de servicio [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "Enviando credenciais\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Erro no troco de credenciais\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "Non foi posible desempaquetar os datos do nivel de seguridade\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "Troco de credenciais completo\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "O servidor require integridade e/ou privacidade\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Desempaquetadas as marcas do nivel de seguridade: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "O tamao mximo do smbolo GSS %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Erro crear a peticin de nivel de seguridade\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "Liberando as credenciais GSS\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Erro liberando as credenciais\n"
@@ -1797,99 +1797,99 @@ msgstr "Protocolo identificabo como IMAP2 ou IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr ""
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr ""
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr ""
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
-#: imap.c:593
+#: imap.c:586
#, fuzzy
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
#, fuzzy
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "Capacidade LOGIN requirida non soportada polo servidor\n"
-#: imap.c:686
+#: imap.c:679
#, fuzzy, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "a mensaxe %d non tia o tamao agardado (%d real != %d agardado)\n"
-#: imap.c:825
+#: imap.c:818
#, fuzzy, c-format
msgid "%lu is unseen\n"
msgstr "a %u anda foi lida\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "a %u anda foi lida\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "fallou a nova tentativa de baixar mensaxes\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, fuzzy, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "Non hai mensaxes agardando para %s\n"
msgstr[1] "Non hai mensaxes agardando para %s\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "fallou a seleccin de caixa de correo\n"
-#: imap.c:953
+#: imap.c:946
#, fuzzy, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "Non hai mensaxes agardando para %s\n"
msgstr[1] "Non hai mensaxes agardando para %s\n"
-#: imap.c:967
+#: imap.c:960
#, fuzzy
msgid "expunge failed\n"
msgstr "fallou o execl(%s)\n"
-#: imap.c:971
+#: imap.c:964
#, fuzzy, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "Non hai mensaxes agardando para %s\n"
msgstr[1] "Non hai mensaxes agardando para %s\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "fallou a busca de mensaxes non lidas\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, fuzzy, c-format
msgid "%u is first unseen\n"
msgstr "a %u anda foi lida\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2093,7 +2093,7 @@ msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr "Non se puido decodificar o challenge OTP\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Contrasinal segreda: "
@@ -2445,81 +2445,81 @@ msgstr " -r, --folder indicar o nome da carpeta remota\n"
msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr ""
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr ""
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr ""
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Mostra da data de APOP requirida non atopada no sado\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "Erro de sintaxe na mostra da data no sado\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr ""
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Peticin de protocolo indefinida en POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "bloqueo activado! Hai outra sesin activa?\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr ""
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr ""
-#: pop3.c:836
+#: pop3.c:831
#, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr ""
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"Mensaxes inseridas nunha lista no servidor. Non se pode manexar isto.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "erro de protocolo\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "erro de protocolo obter os UIDLs\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr ""
-#: pop3.c:1424
+#: pop3.c:1419
#, fuzzy
msgid "Option --folder is not supported with POP3\n"
msgstr "A opcin --remote non est soportada con POP3\n"
@@ -2791,124 +2791,124 @@ msgstr ""
msgid "mail from %s bounced to %s\n"
msgstr ""
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr ""
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "erro de %cMTP: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr ""
-#: sink.c:745
+#: sink.c:735
#, fuzzy, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "Fallou a apertura do ficheiro BSMTP ou a escritura do prembulo\n"
-#: sink.c:791
+#: sink.c:781
#, fuzzy, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "Fallou a apertura do ficheiro BSMTP ou a escritura do prembulo\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "O receptor %cMTP non acepta o enderezo de destinatario `%s'\n"
-#: sink.c:1012
+#: sink.c:1002
#, fuzzy, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "O receptor %cMTP non acepta o enderezo de destinatario `%s'\n"
-#: sink.c:1058
+#: sink.c:1048
#, fuzzy
msgid "no address matches; no postmaster set.\n"
msgstr "ningunha coincidencia do enderezo; redirixindo a %s.\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "non se pode nin sequera enviar a %s!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "ningunha coincidencia do enderezo; redirixindo a %s.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "a piques de entregar con: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr ""
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "Fallou a apertura MDA\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "fallou a conexin %cMTP a %s\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr ""
-#: sink.c:1383
+#: sink.c:1373
#, fuzzy, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "Fallou o remate da mensaxe ou o pechamento do ficheiro BSMTP\n"
-#: sink.c:1408
+#: sink.c:1398
#, fuzzy, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Erro liberando as credenciais\n"
-#: sink.c:1411
+#: sink.c:1401
#, fuzzy, c-format
msgid "MDA died of signal %d\n"
msgstr "espertado por sinal %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, fuzzy, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "O MDA saiu anormalmente ou devolveu estado non cero\n"
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr ""
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "O receptor SMTP rexeitou a entrega\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "Erro na entrega LMTP no EOM\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Resposta distinta de 503 non agardada LMTP EOM: %s\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3188,22 +3188,22 @@ msgstr ""
msgid "Cygwin socket read retry failed!\n"
msgstr ""
-#: transact.c:65
+#: transact.c:71
#, fuzzy, c-format
msgid "mapped address %s to local %s\n"
msgstr "%s asociado a %s local\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "%s asociado a %s local\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "pasou por %s coincidindo con %s\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3212,67 +3212,88 @@ msgstr ""
"analizando a lia Received:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "lia aceptada, %s un alias do servidor de correo\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "lia rexeitada, %s non un alias do servidor de correo\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "non se atopou ningn enderezo `Received'\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "atopouse o enderezo `Received' `%s'\n"
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr "delimitador de mensaxes atopado explora-las cabeceiras\n"
-#: transact.c:597
+#: transact.c:603
#, fuzzy, c-format
msgid "line: %s"
msgstr "Recibindo de %s\n"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"analizando a lia Received:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "non hai ningunha coincidencia local, reenviando a %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "reenvo e borrado omitidos por causa de erros de DNS\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "escribindo cabeceiras de mensaxe RFC822\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr "ningn dos enderezos coincidiu cos nomes locais declarados"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "o enderezo de destinatario %s non coincidiu con ningn nome local"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "a mensaxe contn caracteres nulos"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr ""
"O servidor SMTP receptor rexeitou os enderezos de destinatario locais: "
-#: transact.c:1445
+#: transact.c:1473
#, fuzzy
msgid "error writing message text\n"
msgstr "escribindo o texto da mensaxe\n"
diff --git a/po/id.po b/po/id.po
index 4e4630f6..aadf3b0e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.17-pre1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2010-05-03 05:29+0700\n"
"Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -1637,69 +1637,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "Galat %cMTP: %s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "Tak mendapatkan nama layanan untuk [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Menggunakan nama layanan [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "Mengirim kredensial\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Galat menukar kredential\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "Tak dapat membongkar level keamanan data\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "Penukaran kredensial selesai\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "Server memerlukan integritas dan/atau privasi\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Bendera level keamanan terbongkar: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "Ukuran token GSS maksmimum adalah %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Galat membuat permintaan level kemanan.\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "Membebaskan kredensial GSS\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Galat membebaskan kredensial\n"
@@ -1739,95 +1739,95 @@ msgstr "Protokol teridentifkasi sebagai IMAP2 atau IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "akan siaga setelah penjajakan\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: pemutakhiran ke TLS sukses.\n"
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: pemutakhiran ke TLS gagal.\n"
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: pemutakhiran oportunistik ke TLS gagal, coba melanjutkan\n"
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Kemampuan OTP yang diperlukan tidak dikompilasi ke fetchmail\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Kemampuan NTLM yang diperlukan tidak dikompilasi ke fetchmail\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "Kemampuan LOGIN yang diperlukan tidak dikompilasi oleh server\n"
-#: imap.c:686
+#: imap.c:679
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "penghapusan surat tidak cocok (%d sebenarnya != %d diharapkan)\n"
-#: imap.c:825
+#: imap.c:818
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu tak terlihat\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u sekarang tak terlihat\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "penjajakan ulang gagal\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d pesan menunggu setelah penjajakan ulang\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "pemilihan kotak surat gagal\n"
-#: imap.c:953
+#: imap.c:946
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d pesan menunggu setelah penjajakan pertama\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "penghapusan gagal\n"
-#: imap.c:971
+#: imap.c:964
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d pesan menunggu setelah penghapusan\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "penelusuran pesan tak terlihat gagal\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u pertama kali tak terlihat\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
"Peringatan: mengabaikan data palsu untuk ukuran pesan yang dikembalikan oleh "
"server.\n"
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2022,7 +2022,7 @@ msgstr "server recv fatal\n"
msgid "Could not decode OTP challenge\n"
msgstr "Tak dapat mengawasandi tantangan OTP\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Frasa sandi rahasia:"
@@ -2365,7 +2365,7 @@ msgstr " -r, --folder tentukan nama folder jarak jauh\n"
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots tampilkan titik proses bahkan di berkas catatan\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2373,75 +2373,75 @@ msgstr ""
"Peringatan: \"server Maillennium POP3/PROXY\" ditemukan, gunakan perintah "
"RETR ketimbang TOP.\n"
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
"TLS merupakan keharusan untuk sesi ini, tapi server menolak perintah CAPA.\n"
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr "Perintah CAPA diperlukan untuk TLS.\n"
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: pemutakhiran oportunistik ke TLS gagal, coba melanjutkan.\n"
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr "Kami kehabisan otentikator yang diizinkan dan tak dapat melanjutkan.\n"
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Stempel waktu APOP yang diperlukan tak ditemukan dalam perkenalan\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "Galat sintaks stempel waktu dalam perkenalan\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr "Stempel waktu APOP tidak sah.\n"
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Permintaan protokol tak didefinisikan di POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "kunci sibuk! Apakah sesi lain aktif?\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "Tak dapat menangani repson UIDL dari server upstream.\n"
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr "Server menjawab dengan UID untuk pesan salah.\n"
-#: pop3.c:836
+#: pop3.c:831
#, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (num=%u) dihapus, tapi masih ada!\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "Pesan dimasukkan dalam senarai pada server. Tak dapat menangani ini.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "galat protokol\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "galat protokol ketika mengambil UIDL\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) dihapus, tapi masih ada!\n"
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr "Opsi --folder tidak didukung dengan POP3\n"
@@ -2715,104 +2715,104 @@ msgstr "SMTP: (tubuh pesan-pantul)\n"
msgid "mail from %s bounced to %s\n"
msgstr "pesan dari %s dipantulkan ke %s\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "Galat tersimpan masih %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "Galat %cMTP: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr "Server SMTP memerlukan STARTTLS, menyimpan pesan.\n"
-#: sink.c:745
+#: sink.c:735
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "Buka berkas BSMTP gagal: %s\n"
-#: sink.c:791
+#: sink.c:781
#, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "Penulisan preambul BSMTP gagal: %s.\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "Pendengar %cMTP tidak menyukai alamat penerima `%s'\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "Pendengar %cMTP sangat tidak menyukai alamat penerima `%s'\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "tak ada alamat yang cocok; tak ada tuan pos yang diatur.\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "bahkan tak dapat mengirim ke %s!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "tak ada kecocokan alamat; meneruskan ke %s.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "akan mengantarkan dengan: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr "Tak dapat mengganti id pengguna efektif ke %ld: %s\n"
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr "Tak dapat mengganti id pengguna efektif kembali ke %ld asli: %s\n"
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "Buka MDA gagal\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "Sambungan %cMTP ke %s gagal\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "tak dapat menaikkan pendengar; mengembalikan ke %s"
-#: sink.c:1383
+#: sink.c:1373
#, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "Penghapusan pesan atau penutupan berkas BSMTP gagal: %s\n"
-#: sink.c:1408
+#: sink.c:1398
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Galat menulis ke MDA: %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA mati karena sinyal %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA mengembalikan status tidak nol %d\n"
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2820,21 +2820,21 @@ msgstr ""
"Aneh: MDA pclose mengembalikan %d dan errno %d/%s, tak dapat menangani di %s:"
"%d\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "Pendengar SMTP menolak kiriman.\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "Galat kiriman LMTP pada akhir pesan\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr ""
"Balasan bukan-503 yang tidak diharapkan terhadap akhir pesan LMTP: %s\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3124,22 +3124,22 @@ msgstr "Coba ulang baca soket Cygwin\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "Coba ulang baca soket Cygwin gagal!\n"
-#: transact.c:65
+#: transact.c:71
#, c-format
msgid "mapped address %s to local %s\n"
msgstr "memetakan alamat %s ke lokal %s\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "memetakan %s ke lokal %s\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "dilewati melalui %s mencocokkan %s\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3148,67 +3148,88 @@ msgstr ""
"menganalisan baris Diterima:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "baris diterima, %s merupakan alias server surat\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "baris ditolak, %s bukan alias dari server surat\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "tak ada alamat Diterima yang ditemukan\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "menemukan alamat Diterima `%s'\n"
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr "baris tajuk tak benar ditemukan ketika memindai tajuk\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "baris: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"menganalisan baris Diterima:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "tak ada lokal yang cocok, meneruskan ke %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "meneruskan dan menghapus ditekan karena galat DNS\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "menulis RFC822 msgblk.headers\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr ""
"tak ada alamat penerima yang cocok dengan nama lokal yang dideklarasikan"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "alamat penerima %s tidak cocok dengan nama lokal apapun"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "pesan memiliki NUL tertanam"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "Pendengar SMTP menolak alamat penerima lokal: "
-#: transact.c:1445
+#: transact.c:1473
msgid "error writing message text\n"
msgstr "galat menulis teks pesan\n"
diff --git a/po/ja.po b/po/ja.po
index 708bdf9e..81a0f055 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.18-pre2\n"
+"Project-Id-Version: fetchmail 6.3.18\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
-"PO-Revision-Date: 2010-09-26 22:56+0700\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
+"PO-Revision-Date: 2010-10-10 15:08+0700\n"
"Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -84,14 +84,14 @@ msgstr ""
msgid " %d message %d octets long deleted by fetchmail."
msgid_plural " %d messages %d octets long deleted by fetchmail."
msgstr[0] ""
-"fetchmail が %d 通のメッセージ(%d bytes の長さがあります)を削除しました。"
+" fetchmail が %d 通のメッセージ(%d bytes の長さがあります)を削除しました。"
#: driver.c:371
#, c-format
msgid " %d message %d octets long skipped by fetchmail."
msgid_plural " %d messages %d octets long skipped by fetchmail."
msgstr[0] ""
-"fetchmail が %d 通のメッセージ(%d バイト の長さがあります)を読み飛ばしまし"
+" fetchmail が %d 通のメッセージ(%d バイト の長さがあります)を読み飛ばしまし"
"た。"
#: driver.c:518
@@ -1201,9 +1201,8 @@ msgid " OTP authentication will be forced.\n"
msgstr " OTP による認証を強制的に行います。\n"
#: fetchmail.c:1651
-#, fuzzy
msgid " CRAM-MD5 authentication will be forced.\n"
-msgstr " CRAM-MD5 方式による認証を強制的に行います。\n"
+msgstr " CRAM-MD5 方式による認証を強制的に行います。\n"
#: fetchmail.c:1654
msgid " GSSAPI authentication will be forced.\n"
@@ -1670,70 +1669,70 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "GSSAPI エラー %s: %.*s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr " [%s] に対するサービス名を得ることができませんでした。\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr " サービス名 [%s] を利用します。\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr "適切な GSSAPI 証明書が見つかりません。GSSAPI 認証をスキップします。\n"
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
"GSSAPI を使うには、まず証明書が必要です。kinit が助けになるかもしれません。\n"
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
-msgstr ""
+msgstr "\"%s GSSAPI\"に対し、偽造された試行を受信しました!\n"
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "証明書を送信します。\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "証明書交換エラーです。\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "セキュリティーレベルデータを変更しました。\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "証明書の交換が終了しました。\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "サーバは integrity と privacy を要求しています\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "変更されないセキュリティーレベルのフラグ: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "最大 GSS トークン長は %ld です\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "セキュリティーレベルの要求の生成エラーです。\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "GSS 証明書を発行します。\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "証明書の発行エラーです。\n"
@@ -1773,96 +1772,96 @@ msgstr "プロトコルは IMAP2 又は IMAP2BIS と認識されました。\n"
msgid "will idle after poll\n"
msgstr "接続の後、休止します。\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: TLS へのアップグレードに成功。\n"
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: TLS へのアップグレードに失敗。\n"
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: TLS への適合的アップグレードに失敗、継続可能か試しています\n"
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr ""
"OTP が要求されましたが、fetchmail が OTP 対応でコンパイルされていません。\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "要求された NTLM 処理能力は fetchmail に組み込まれていません。\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "要求された LOGIN 処理能力はサーバでサポートされていません。\n"
-#: imap.c:686
+#: imap.c:679
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "メッセージの削除数が合いません (%d (実際) != %d (予想)) \n"
-#: imap.c:825
+#: imap.c:818
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu は未読です。\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u は未読です。\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "再アクセスに失敗しました。\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d 通のメッセージが再アクセスの後に存在します。\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "メールボックスの選択に失敗しました\n"
-#: imap.c:953
+#: imap.c:946
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "最初のアクセスから %d 通のメッセージがあります。\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "削除に失敗しました。\n"
-#: imap.c:971
+#: imap.c:964
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "削除の後、%d 通のメッセージが残っています。\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "未読メッセージの検索に失敗しました。\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u は最初の未読メッセージです。\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
"警告: サーバからメッセージサイズとして報告された数値が不適切だったので無視し"
"ます。\n"
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr "正しくないFETCH応答が返ってきました: %s\n"
@@ -2060,7 +2059,7 @@ msgstr "server recv fatal\n"
msgid "Could not decode OTP challenge\n"
msgstr "OTP challenge のデコードが出来ませんでした。\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Secret pass phrase: "
@@ -2408,7 +2407,7 @@ msgstr " -r, --folder サーバのメールフォルダを指定します\
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots ログファイルにも進行状況を示す . を書き込みます\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2416,78 +2415,78 @@ msgstr ""
"警告: Maillennium POP3/プロクシサーバです。TOP の代わりに RETR コマンドを使用"
"します。\n"
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
"このセッションには TLS が必要ですが、サーバが CAPA コマンドを拒否しました。\n"
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr "CAPA コマンドは TLS では必須です。\n"
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: TLS への適合的アップグレードに失敗、継続可能か試しています。\n"
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr ""
"使用を許可されたすべての認証手段を試みましたが、すべて失敗しました。実行を継"
"続できません。\n"
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "greeting 中に APOP タイムスタンプが存在しません。\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "greeting 中の タイムスタンプが不正です。\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr "無効な APOP タイムスタンプです。\n"
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "POP3_auth 中で定義されていないプロトコルが要求されました。\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "lock busy 状態です。別の交信が行われていないか確認して下さい。\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "上流サーバからの UIDL 応答に対応できません。\n"
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr "サーバが誤ったメッセージの UID に応答しました。\n"
-#: pop3.c:836
+#: pop3.c:831
#, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (num=%u) は削除されましたが、まだ存在しています!\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"サーバリストにメッセージが挿入されています。取り扱うことができません。\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "プロトコルエラーです。\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "UIDL を取り込み中にプロトコルエラーが発生しました。\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) は削除されましたが、まだ存在しています!\n"
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr "POP3 では --folder オプションは利用できません。\n"
@@ -2764,108 +2763,108 @@ msgstr "SMTP: (転送されたメッセージの本体)\n"
msgid "mail from %s bounced to %s\n"
msgstr "%s からのメールを %s に転送します。\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "エラーはまだ %d です。\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "%cMTP エラー: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr "SMTP サーバは STARTTLS を要求しています、メッセージを保存しました。\n"
-#: sink.c:745
+#: sink.c:735
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "BSMTP ファイル %s のオープンが失敗しました。\n"
-#: sink.c:791
+#: sink.c:781
#, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "BSMTP プリアンブルの書き込みに失敗しました: %s\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr ""
"%cMTP 送信先のアプリケーションが `%s' という受け手のアドレスを受け付けませ"
"ん。\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr ""
"%cMTP 送信先のアプリケーションが `%s' という受け手のアドレスを受け付けませ"
"ん。\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "アドレスが一致しません。postmaster が設定されていません。\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "%s に対してさえ送信できません。\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "アドレスが一致しません。%s へ転送します。\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "%s を利用した配信について\n"
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr "実効ユーザID を %ld に変更できません: %s\n"
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr "実効ユーザID を 元の %ld に変更できません: %s\n"
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "MDA の起動に失敗しました。\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "%cMTP による %s への接続に失敗しました。\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "通信先のアプリケーションと交信できません。%s と交信します。"
-#: sink.c:1383
+#: sink.c:1373
#, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "メッセージの終了 または BSMTP ファイルを閉じる際に失敗しました。: %s\n"
-#: sink.c:1408
+#: sink.c:1398
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "MDAへの書き込みでエラーが発生しました: %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA が %d 番の信号を受信したため終了しました。\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA が 0 以外のステータス %d を返して終了しました。\n"
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2873,20 +2872,20 @@ msgstr ""
"異常: MDA の pclose が %d を返しました。エラー番号%d/%s 、どうしていいかわか"
"りません。ファイル %s:%d 行\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "SMTP 通信先のアプリケーションが配信を拒みました。\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "LMTP の EOM における配信エラーです。\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "LMTP EOM に対して 503 以外の予期せぬ応答 %s がありました。\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3177,22 +3176,22 @@ msgstr "Cygwin ソケット読み込み リトライ\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "Cygwin ソケット読み込み リトライ が失敗しました!\n"
-#: transact.c:65
+#: transact.c:71
#, c-format
msgid "mapped address %s to local %s\n"
msgstr "%s をローカルの %s にマップしました。\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "%s をローカルの %s に置換しました。\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "%s と %s が一致しました。\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3201,67 +3200,88 @@ msgstr ""
"Receive 行を解析中です:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "行が受領されました。%s はメールサーバの別名です。\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "行が拒絶されました。%s はメールサーバの別名ではありません。\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "Received のアドレスがありません。\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "Received のアドレスは `%s' です。\n"
-#: transact.c:595
+#: transact.c:601
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr ""
"ヘッダを解析中にエラーのある行を見つけました - man ページの bad-header オプ"
"ションを読んでください\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "該当行: %s "
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"Receive 行を解析中です:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "%s という転送先に該当するものがありません。\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "DNS の不調で転送と削除が出来ませんでした。\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "RFC822 msgblk.headers を書き込んでいます。\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr "こちらで宣言されたアドレスと受取手のアドレスが一致しませんでした。"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "受取手のアドレス %s に該当する物がありません。"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "メッセージに NUL が含まれています"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP 受信プログラムが次のアドレスの受信を拒否しました : "
-#: transact.c:1445
+#: transact.c:1473
msgid "error writing message text\n"
msgstr "メッセージを書き込む際にエラーが発生しました\n"
diff --git a/po/nl.po b/po/nl.po
index edbf56dc..7143df1c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,10 +7,10 @@
# Erwin Poeze <erwin.poeze@gmail.com>, 2009, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail-6.3.18-pre2\n"
+"Project-Id-Version: fetchmail-6.3.18\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
-"PO-Revision-Date: 2010-09-26 18:15+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
+"PO-Revision-Date: 2010-10-10 09:35+0200\n"
"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
#: checkalias.c:179
#, c-format
msgid "Checking if %s is really the same node as %s\n"
-msgstr "Controle of %s echt dezelfde machine is als %s...\n"
+msgstr "Controle of %s echt dezelfde machine is als %s\n"
#: checkalias.c:183
msgid "Yes, their IP addresses match\n"
@@ -1176,7 +1176,6 @@ msgid " OTP authentication will be forced.\n"
msgstr " OTP-authenticatie wordt afgedwongen.\n"
#: fetchmail.c:1651
-#, fuzzy
msgid " CRAM-MD5 authentication will be forced.\n"
msgstr " CRAM-MD5-authenticatie wordt afgedwongen.\n"
@@ -1669,73 +1668,73 @@ msgstr "GSSAPI-fout in gss_display_status aangeroepen door <%s>\n"
msgid "GSSAPI error %s: %.*s\n"
msgstr "GSSAPI-fout %s: %.*s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "Kan geen servicenaam vinden voor [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Servicenaam [%s] wordt gebruikt\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
"Geen geschikte authenticatiegegevens van GSSAPI gevonden, SGGAPI-"
"authenticatie overslaan.\n"
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
"Voor het gebruik van GSSAPI heeft u authenticatiegegevens nodig, mogelijk "
"van kinit.\n"
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
-msgstr ""
+msgstr "Misvormde 'challenge' gestuurd aan \"%s GSSAPI\" ontvangen!\n"
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "Versturen van logingegevens\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Fout bij uitwisselen van login-gegevens\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "Kan beveiligingstunnel niet uitvouwen\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "Login-gegevens succesvol uitgewisseld\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "Server vereist integriteit en/of privacy\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Eigenschappen van uitgevouwen beveiligingstunnel: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "Maximale grootte van GSS-token is %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Fout bij het doen van beveiligingsverzoek\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "GSS-login-gegevens worden afgegeven\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Fout bij het afgeven van gegevens\n"
@@ -1775,96 +1774,96 @@ msgstr "Protocol herkend als IMAP2 of IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "zal nietsdoen na verzoek\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: opwaardering naar TLS is geslaagd.\n"
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: opwaardering naar TLS is mislukt.\n"
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: poging tot opwaardering naar TLS is mislukt; doorgegaan\n"
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Benodigde OTP-ondersteuning is niet in fetchmail gecompileerd\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Benodigde NTLM-ondersteuning is niet in fetchmail gecompileerd\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "Benodigde LOGIN-mogelijkheid wordt niet door server ondersteund\n"
-#: imap.c:686
+#: imap.c:679
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "bericht-expunge komt niet overeen (is %d, waar %d verwacht)\n"
-#: imap.c:825
+#: imap.c:818
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu is ongelezen\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u is ongelezen\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "opnieuw polsen is mislukt\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d bericht in wachtrij na nieuwe aanvraag\n"
msgstr[1] "%d berichten in wachtrij na nieuwe aanvraag\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "mailbox-selectie is mislukt\n"
-#: imap.c:953
+#: imap.c:946
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d bericht in wachtrij na eerste aanvraag\n"
msgstr[1] "%d berichten in wachtrij na eerste aanvraag\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "expunge is mislukt\n"
-#: imap.c:971
+#: imap.c:964
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d bericht in wachtrij na expunge\n"
msgstr[1] "%d berichten in wachtrij na expunge\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "zoeken naar ongelezen berichten is mislukt\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u is als eerste nog niet gelezen\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr "Waarschuwing: server geeft onzinnige berichtgrootten terug.\n"
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr "Onjuist FETCH-antwoord: %s.\n"
@@ -1949,7 +1948,7 @@ msgstr "activiteit op %s was %d, is %d\n"
#: kerberos.c:74
msgid "could not decode initial BASE64 challenge\n"
-msgstr "kan initiële 'BASE64 challenge' niet decoderen\n"
+msgstr "kan initiële 'BASE64-challenge' niet decoderen\n"
#: kerberos.c:139
#, c-format
@@ -1967,7 +1966,7 @@ msgstr "kan 'BASE64 ready'-respons niet decoderen\n"
#: kerberos.c:220
msgid "challenge mismatch\n"
-msgstr "challenge klopt niet\n"
+msgstr "'challenge' klopt niet\n"
#: lock.c:87
#, c-format
@@ -2057,9 +2056,9 @@ msgstr "server recv is mislukt\n"
#: opie.c:56
msgid "Could not decode OTP challenge\n"
-msgstr "Kan OTP-challenge niet decoderen\n"
+msgstr "Kan 'OTP-challenge' niet decoderen\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Geheime wachtwoordzin: "
@@ -2402,7 +2401,7 @@ msgstr " -r, --folder te gebruiken map op server\n"
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots voortgangspuntjes ook in logbestanden tonen\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2410,78 +2409,78 @@ msgstr ""
"Waarschuwing: \"Maillennium POP3/PROXY server\" gevonden, gebruik RETR-"
"commando in plaats van TOP.\n"
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
"TLS is verplicht voor deze sessie, maar de server weigert CAPA-opdracht.\n"
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr "De CAPA-opdracht is echter nodig voor TLS.\n"
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: poging tot opwaardering naar TLS is mislukt; doorgegaan\n"
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr ""
"Het maximum aantal toegestane authenticators is bereikt, kan niet verder "
"gaan.\n"
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Vereiste APOP tijdstempel niet aangetroffen in begroeting\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "Tijdstempel syntaxfout in begroeting\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr "Ongeldig APOP-tijdsstempel.\n"
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Ongedefinieerd protocol-verzoek in POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "Vergrendeling actief! Draait er nog een sessie?\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "UIDL-respons van upstreamserver kan niet worden verwerkt.\n"
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr "Server reageerde met UID voor verkeerd bericht.\n"
-#: pop3.c:836
+#: pop3.c:831
#, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (num=%u) is al verwijderd, maar bestaat nog steeds!\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"Berichten ingevoegd in de lijst op de server. Kan hier niet mee omgaan.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "protocolfout\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "protocolfout tijdens het ophalen van UIDLs\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) is al verwijderd, maar bestaat nog steeds!\n"
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr "Optie '--folder' is niet mogelijk met POP3\n"
@@ -2583,7 +2582,7 @@ msgstr "Service koos RPA versie %d. %d\n"
#: rpa.c:191
#, c-format
msgid "Service challenge (l=%d):\n"
-msgstr "Service-challenge (l=%d):\n"
+msgstr "'Service-challenge' (l=%d):\n"
#: rpa.c:200
#, c-format
@@ -2721,7 +2720,7 @@ msgstr " aanval door een vijandige service is mogelijk).\n"
#: rpa.c:724
msgid "User challenge:\n"
-msgstr "Gebruikers-challenge:\n"
+msgstr "'Gebruikers-challenge':\n"
#: rpa.c:874
msgid "MD5 being applied to data block:\n"
@@ -2759,106 +2758,106 @@ msgstr "SMTP: (bounce-message-body)\n"
msgid "mail from %s bounced to %s\n"
msgstr "mail van %s gebounced naar %s\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "Opgeslagen fout is nog steeds %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "%cMTP-fout: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr "SMTP-server vereist STARTTLS, bericht behouden.\n"
-#: sink.c:745
+#: sink.c:735
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "Openen van BSMTP-bestand is mislukt: %s\n"
-#: sink.c:791
+#: sink.c:781
#, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "Schrijven van BSMTP-voorwoord is mislukt: %s.\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "%cMTP-programma wijst ontvangeradres '%s' af\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "%cMTP-programma vindt ontvangeradres '%s' maar zozo\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "geen adres komt overeen, geen postmaster ingesteld.\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "kan niet eens naar %s zenden!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "geen adres komt overeen; doorsturen naar %s.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "Staat op het punt te bezorgen met: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr "Kan geldig gebruikersid niet veranderen in %ld: %s\n"
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
"Kan geldig gebruikersid niet terug veranderen naar het oorspronkelijke %ld: %"
"s\n"
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "Openen van MDA mislukt\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "%cMTP-verbinding met %s is mislukt\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "kan geen contact krijgen met luisterend programma; valt terug naar %s"
-#: sink.c:1383
+#: sink.c:1373
#, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "Afbreken bericht of sluiten van BSMTP-bestand is mislukt: %s\n"
-#: sink.c:1408
+#: sink.c:1398
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Fout bij schrijven naar MDA: %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA is geëlimineerd door signaal %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "afsluitwaarde van MDA is niet nul: %d\n"
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2866,20 +2865,20 @@ msgstr ""
"Vreemd: pclose() van MDA gaf %d terug en foutcode %d/%s;\n"
"kan dit niet verwerken, op %s:%d\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "SMTP-programma weigert te bezorgen\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "LMTP-bezorgfout op EOM\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Onverwachte respons (niet 503) op LMTP-EOM: %s\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -2902,7 +2901,7 @@ msgstr "Onjuiste Base64-respons van de server.\n"
#: smtp.c:99
#, c-format
msgid "Challenge decoded: %s\n"
-msgstr "Challenge is gedecodeerd: %s\n"
+msgstr "'Challenge' is gedecodeerd: %s\n"
#: smtp.c:116
msgid "ESMTP PLAIN Authentication...\n"
@@ -3172,22 +3171,22 @@ msgstr "Poging om Cygwin-socket opnieuw te lezen\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "Poging om Cygwin-socket opnieuw te lezen is mislukt!\n"
-#: transact.c:65
+#: transact.c:71
#, c-format
msgid "mapped address %s to local %s\n"
msgstr "adres %s is op lokale %s afgebeeld\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "%s is op lokale %s afgebeeld\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "via %s overeenkomend met %s\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3196,67 +3195,88 @@ msgstr ""
"analyseren van Received-regel:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "regel is geaccepteerd, %s is een alias van de mailserver\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "regel is geweigerd, %s is geen alias van de mailserver\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "geen Received-adres gevonden\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "Received-adres gevonden: '%s'\n"
-#: transact.c:595
+#: transact.c:601
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr ""
"onjuiste kopregel gevonden - zie manpagina voor slechte-kopregeloptie\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "regel: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"analyseren van Received-regel:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "geen lokale overeenkomsten; doorsturen naar %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "doorsturen en verwijderen is onderdrukt vanwege DNS-fouten\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "schrijven van RFC822 msgblk.headers\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr ""
"geen van de ontvangeradressen komt overeen met gedeclareerde lokale namen"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "ontvangeradres %s komt niet overeen met een lokale naam"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "bericht bevat NUL-tekens"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP-programma heeft de volgende lokale ontvangers geweigerd: "
-#: transact.c:1445
+#: transact.c:1473
msgid "error writing message text\n"
msgstr "fout bij schrijven van berichttekst\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a8db62eb..093abfd0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail-5.4.4\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2000-07-28 09:40-03:00\n"
"Last-Translator: Marcia Norie Nakaza <norie@conectiva.com.br>\n"
"Language-Team: pt_BR <ldp-br@bazar.conectiva.com.br>\n"
@@ -1698,69 +1698,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "Erro %cMTP: %s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "No foi possvel obter nome do servio para [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Usando nome do servio [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "Enviando credenciais\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Erro na troca de credenciais\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "No foi possvel desempacotar dados do nvel de segurana\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "Troca de credenciais completa\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "Servidor requer integridade e/ou privacidade\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Desempacotadas marcas de nvel de segurana: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "Tamanho mximo do smbolo GSS %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Erro criando solicitao de nvel de segurana\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "Liberando credenciais GSS\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Erro na liberao de credenciais\n"
@@ -1802,99 +1802,99 @@ msgstr "Protocolo identificado como IMAP2 ou IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr ""
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr ""
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr ""
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
-#: imap.c:593
+#: imap.c:586
#, fuzzy
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Capacidade de LOGIN exigida no suportada pelo servidor\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
#, fuzzy
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Capacidade de LOGIN exigida no suportada pelo servidor\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "Capacidade de LOGIN exigida no suportada pelo servidor\n"
-#: imap.c:686
+#: imap.c:679
#, fuzzy, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "mensagem %d no possui o tamanho esperado (%d atual != %d esperado)\n"
-#: imap.c:825
+#: imap.c:818
#, fuzzy, c-format
msgid "%lu is unseen\n"
msgstr "%u no vista\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u no vista\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "nova tentativa de baixar mensagens falhou\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, fuzzy, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "Nenhuma mensagem esperando para %s\n"
msgstr[1] "Nenhuma mensagem esperando para %s\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "seleo de caixa postal falhou\n"
-#: imap.c:953
+#: imap.c:946
#, fuzzy, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "Nenhuma mensagem esperando para %s\n"
msgstr[1] "Nenhuma mensagem esperando para %s\n"
-#: imap.c:967
+#: imap.c:960
#, fuzzy
msgid "expunge failed\n"
msgstr "execl(%s) falhou\n"
-#: imap.c:971
+#: imap.c:964
#, fuzzy, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "Nenhuma mensagem esperando para %s\n"
msgstr[1] "Nenhuma mensagem esperando para %s\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "falha na busca por mensagens no vistas\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, fuzzy, c-format
msgid "%u is first unseen\n"
msgstr "%u no vista\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2099,7 +2099,7 @@ msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr "No foi possvel decodificar o desafio OTP\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Frase-senha secreta: "
@@ -2456,80 +2456,80 @@ msgstr " -r, --folder especifica o nome da pasta remota\n"
msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr ""
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr ""
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr ""
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Data/horrio APOP exigidos no encontrados na saudao\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "Erro de sintaxe na data/horrio da saudao\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr ""
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Solicitao de protocolo no definida em POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "arquivo de travamento presente! H outra sesso ativa?\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr ""
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr ""
-#: pop3.c:836
+#: pop3.c:831
#, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr ""
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "Mensagens inseridas numa lista no servidor. No posso tratar isso.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "erro de protocolo\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "erro de protocolo durante a obteno de UIDLs\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr ""
-#: pop3.c:1424
+#: pop3.c:1419
#, fuzzy
msgid "Option --folder is not supported with POP3\n"
msgstr "Opo --remote no compatvel com POP3\n"
@@ -2802,125 +2802,125 @@ msgstr ""
msgid "mail from %s bounced to %s\n"
msgstr ""
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr ""
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "Erro %cMTP: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr ""
-#: sink.c:745
+#: sink.c:735
#, fuzzy, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "Abertura de arquivo BSMTP ou escrita de prembulo falhou\n"
-#: sink.c:791
+#: sink.c:781
#, fuzzy, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "Abertura de arquivo BSMTP ou escrita de prembulo falhou\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "Cliente %cMTP no gosta do endereo do destinatrio `%s'\n"
-#: sink.c:1012
+#: sink.c:1002
#, fuzzy, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "Cliente %cMTP no gosta do endereo do destinatrio `%s'\n"
-#: sink.c:1058
+#: sink.c:1048
#, fuzzy
msgid "no address matches; no postmaster set.\n"
msgstr "no combina com nada localmente, repassando para %s\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "no possvel nem mandar para %s!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "no combina com nada localmente, repassando para %s\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "prestes a entregar para: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr ""
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "Abertura MDA falhou\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "Conexo %cMTP com %s falhou\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr ""
-#: sink.c:1383
+#: sink.c:1373
#, fuzzy, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "Encerramento de mensagem ou fechamento de arquivo BSMTP falhou\n"
-#: sink.c:1408
+#: sink.c:1398
#, fuzzy, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Erro na liberao de credenciais\n"
-#: sink.c:1411
+#: sink.c:1401
#, fuzzy, c-format
msgid "MDA died of signal %d\n"
msgstr "acordado pelo sinal %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, fuzzy, c-format
msgid "MDA returned nonzero status %d\n"
msgstr ""
"O MDA foi encerrado anormalmente ou retornou status diferente de zero\n"
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr ""
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "Cliente SMTP recusou a entrega\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "Erro na entrega LMTP no EOM\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Resposta no-503 para o EOM LMTP: %s\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3200,22 +3200,22 @@ msgstr ""
msgid "Cygwin socket read retry failed!\n"
msgstr ""
-#: transact.c:65
+#: transact.c:71
#, fuzzy, c-format
msgid "mapped address %s to local %s\n"
msgstr "%s mapeado localmente para %s\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "%s mapeado localmente para %s\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "passou por %s combinando com %s\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3224,67 +3224,88 @@ msgstr ""
"analisando linha Received:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "linha aceita, %s um apelido do servidor de email\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "linha rejeitada, %s no um apelido do servidor de email\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "nenhum endereo Received encontrado\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "encontrado endereo Received `%s'\n"
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr ""
"encontrado o delimitador de mensagens durante varredura de cabealhos\n"
-#: transact.c:597
+#: transact.c:603
#, fuzzy, c-format
msgid "line: %s"
msgstr "Baixando %s\n"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"analisando linha Received:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "no combina com nada localmente, repassando para %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "reenvio e remoo suprimidos devido a erro de DNS\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "escrevendo cabealhos RFC822\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr "nenhum endereo de destino combina com o valor local declarado"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "endereo do destinatrio %s no combina com nenhum nome local"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "a mensagem possui NULs inseridos"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "Cliente SMTP rejeitou o endereo do destinatrio: "
-#: transact.c:1445
+#: transact.c:1473
#, fuzzy
msgid "error writing message text\n"
msgstr "escrevendo o texto da mensagem\n"
diff --git a/po/ru.po b/po/ru.po
index 16200f12..19abdd99 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.10-pre1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2009-06-05 14:53+0200\n"
"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
@@ -1678,69 +1678,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "Ошибка %cMTP: %s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "Невозможно было получить имя службы для [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Используется имя службы [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "Отправляются идентификационные данные\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Ошибка обмена идентификационными данными\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "Невозможно было развернуть данные уровня безопасности\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "Обмен идентификационными данными завершен\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "Серверу требуются целостность и/или конфиденциальность\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Флаги развернутого уровня безопасности: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "Максимальный размер маркера GSS - %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Ошибка создания запроса уровня безопасности\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "Создаются идентификационные данные GSS\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Ошибка создания идентификационных данных\n"
@@ -1780,100 +1780,100 @@ msgstr "Протокол идентифицирован как IMAP2 или IMAP
msgid "will idle after poll\n"
msgstr "будет приостановлен после опроса\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: обновление до TLS выполнено успешно.\n"
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: сбой обновления до TLS.\n"
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
"%s: сбой принудительного обновления до TLS; выполняется попытка продолжить "
"работу\n"
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Fetchmail скомпилирован без требуемой поддержки OTP\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Fetchmail скомпилирован без требуемой поддержки NTLM\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "Требуемая опция LOGIN не поддерживается сервером\n"
-#: imap.c:686
+#: imap.c:679
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "разногласие при удалении писем (%d на самом деле != %d ожидалось)\n"
-#: imap.c:825
+#: imap.c:818
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu не просмотрено\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u не просмотрено\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "не удалось повторить опрос\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "ожидается %d сообщение после повторного опроса\n"
msgstr[1] "ожидается %d сообщений после повторного опроса\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "не удалось выбрать почтовый ящик\n"
-#: imap.c:953
+#: imap.c:946
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "ожидается %d сообщение после первого опроса\n"
msgstr[1] "ожидается %d сообщений после первого опроса\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "не удалось удалить\n"
-#: imap.c:971
+#: imap.c:964
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "ожидается %d сообщение после удаления\n"
msgstr[1] "ожидается %d сообщений после удаления\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "сбой поиска непросмотренных сообщений\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u первое не просмотренное\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
"Предупреждение: игнорируются некорректные данные о размерах сообщений, "
"возвращённые сервером.\n"
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2070,7 +2070,7 @@ msgstr "сервер прекратил получение\n"
msgid "Could not decode OTP challenge\n"
msgstr "Невозможно было декодировать запрос OTP\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Секретная идентификационная фраза:"
@@ -2425,7 +2425,7 @@ msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
" --showdots отображение точечной строки прогресса даже в log-файлах\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2433,78 +2433,78 @@ msgstr ""
"Предупреждение: найден POP3/PROXY-сервер Maillennium; вместо TOP "
"используется команда RETR.\n"
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
"Для этого сеанса требуется использовать TLS, однако сервер отклонил команду "
"CAPA.\n"
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr "Команда CAPA необходима для TLS.\n"
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
"%s: сбой принудительного обновления до TLS; выполняется попытка продолжить "
"работу.\n"
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr "Закончились допустимые аутентификаторы, продолжение невозможно.\n"
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "В приветствии не найдена требуемая временная метка APOP\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "В приветствии ошибка синтаксиса временной метки\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr "Недопустимая временная метка APOP.\n"
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Неопределённый запрос протокола в POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "блокировка занятости! Может активен другой сеанс?\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "Невозможно обработать UIDL-ответ upstream-сервера.\n"
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr "Сервер возвратил ответ с UID для неверного сообщения.\n"
-#: pop3.c:836
+#: pop3.c:831
#, fuzzy, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (номер=%d) было удалено, но все еще присутствует!\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "Сообщения добавлены в список на сервере. Обработка невозможна.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "ошибка протокола\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "ошибка протокола при выборке UIDL'ов\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (номер=%d) было удалено, но все еще присутствует!\n"
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr "Опция --folder не поддерживается с POP3\n"
@@ -2778,104 +2778,104 @@ msgstr "SMTP: (тело сообщения-рикошета)\n"
msgid "mail from %s bounced to %s\n"
msgstr "письмо от %s отправлено рикошетом на %s\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "Сохраненная ошибка все еще %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "Ошибка %cMTP: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr "Для SMTP-сервера требуется STARTTLS; сообщение сохранено.\n"
-#: sink.c:745
+#: sink.c:735
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "Не удалось открыть файл BSMTP: %s\n"
-#: sink.c:791
+#: sink.c:781
#, fuzzy, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "Не удалось записать начальную часть BSMTP.\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "Слушателю %cMTP не понравился адрес получателя `%s'\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "Слушателю %cMTP в самом деле не понравился адрес получателя `%s'\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "нет сопоставленных адресов; постмастер не установлен.\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "даже невозможно отправить на %s!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "нет сопоставленных адресов; переадресовывается на %s.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "будет отправлен с: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, fuzzy, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr "Невозможно переименовать fetchids-файл %s в %s: %s\n"
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "Не удалось открыть MDA\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "Сбой %cMTP-подключения к %s\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "невозможно запустить слушателя; откат на %s"
-#: sink.c:1383
+#: sink.c:1373
#, fuzzy, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "Не удалось удалить сообщение или закрыть файл BSMTP\n"
-#: sink.c:1408
+#: sink.c:1398
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Ошибка записи в MDA: %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA завершен по сигналу %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA возвратил ненулевой статус %d\n"
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2883,20 +2883,20 @@ msgstr ""
"Странно: MDA pclose возвратил %d и ошибку с номером %d/%s, невозможно "
"обработать в %s:%d\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "Слушатель SMTP отказал в доставке\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "Ошибка доставки LMTP на EOM\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Неожиданный не-503 ответ для LMTP EOM: %s\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3181,22 +3181,22 @@ msgstr "Повторная попытка чтения сокета Cygwin\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "Сбой повторного чтения сокета Cygwin!\n"
-#: transact.c:65
+#: transact.c:71
#, c-format
msgid "mapped address %s to local %s\n"
msgstr "установлено соответствие адреса %s локальному %s\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "установлено соответствие %s локальному %s\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "пройден через %s соответствующий %s\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3205,66 +3205,87 @@ msgstr ""
"анализируется строка Received:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "строка принята, %s является алиасом почтового сервера\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "строка отвергнута, %s не является алиасом почтового сервера\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "адрес Received не найден\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "найден адрес Received `%s'\n"
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr "при сканировании заголовков найдена неверная строка\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "строка: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"анализируется строка Received:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "нет локальных совпадений, переадресовывается на %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "переадресация и удаление приостановлены из-за ошибок DNS\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "записываются заголовки RFC822 msgblk\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr "нет адресов получателей, соответствующих объявленным локальным именам"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "адрес получателя %s не соответствует ни одному локальному имени"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "сообщение содержит вложенные NUL"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "Слушатель SMTP отверг адреса локальных получателей: "
-#: transact.c:1445
+#: transact.c:1473
msgid "error writing message text\n"
msgstr "ошибка записи текста сообщения\n"
diff --git a/po/sk.po b/po/sk.po
index 4b09c742..e1a892e1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.18-pre2\n"
+"Project-Id-Version: fetchmail 6.3.18\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
-"PO-Revision-Date: 2010-09-26 18:23+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
+"PO-Revision-Date: 2010-10-15 10:55+0200\n"
"Last-Translator: Marcel Telka <marcel@telka.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"MIME-Version: 1.0\n"
@@ -363,8 +363,8 @@ msgid ""
msgstr ""
"Pokus o autorizáciu bol neúspešný.\n"
"Znamená to pravdepodobne, že vaše heslo je neplatné, avšak niektoré\n"
-"servre majú iné chybové módy, ktoré fetchmail nevie rozpoznať,\n"
-"pretože servre neposlali potrebné chybové hlásenia ohľadom prihlásenia.\n"
+"servery majú iné chybové módy, ktoré fetchmail nevie rozpoznať,\n"
+"pretože servery neposlali potrebné chybové hlásenia ohľadom prihlásenia.\n"
"\n"
"Fetchmail démon bude naďalej pokračovať v práci a bude sa pokúšať\n"
"o spojenie. Ďalšie upozornenia nebudú zasielané, pokiaľ služba\n"
@@ -484,7 +484,7 @@ msgstr "protokol klient/server"
#: driver.c:1564
msgid "lock busy on server"
-msgstr "zámok na servri zaneprázdnený"
+msgstr "zámok na serveri zaneprázdnený"
#: driver.c:1567
msgid "SMTP transaction"
@@ -718,7 +718,7 @@ msgstr " a "
#: fetchmail.c:414
#, c-format
msgid "No mailservers set up -- perhaps %s is missing?\n"
-msgstr "Nie sú nastavené poštové severy -- možno chýba %s?\n"
+msgstr "Nie sú nastavené poštové servery -- možno chýba %s?\n"
#: fetchmail.c:435
msgid "fetchmail: no mailservers have been specified.\n"
@@ -1122,8 +1122,8 @@ msgstr " Pošta bude získaná cez %s\n"
#, fuzzy, c-format
msgid " Poll of this server will occur every %d interval.\n"
msgid_plural " Poll of this server will occur every %d intervals.\n"
-msgstr[0] " Dotazovanie tohoto servra bude vykonané každé %d intervaly.\n"
-msgstr[1] " Dotazovanie tohoto servra bude vykonané každé %d intervaly.\n"
+msgstr[0] " Dotazovanie tohoto servera bude vykonané každé %d intervaly.\n"
+msgstr[1] " Dotazovanie tohoto servera bude vykonané každé %d intervaly.\n"
#: fetchmail.c:1594
#, c-format
@@ -1266,7 +1266,7 @@ msgstr " Odtlačok SSL kľúča (kontrolovaný oproti kľúču servera): %s\n"
#: fetchmail.c:1686
#, fuzzy, c-format
msgid " Server nonresponse timeout is %d seconds"
-msgstr " Časový limit pre ne-odpovedanie servra je %d sekúnd"
+msgstr " Časový limit pre ne-odpovedanie servera je %d sekúnd"
#: fetchmail.c:1688
#, fuzzy
@@ -1326,12 +1326,12 @@ msgstr ""
#: fetchmail.c:1718
#, fuzzy
msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n"
-msgstr " Prepis lokálnej adresy servra je %s (--norewrite %s).\n"
+msgstr " Prepis lokálnej adresy servera je %s (--norewrite %s).\n"
#: fetchmail.c:1719
#, fuzzy
msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n"
-msgstr " Prepis lokálnej adresy servra je %s (--norewrite %s).\n"
+msgstr " Prepis lokálnej adresy servera je %s (--norewrite %s).\n"
#: fetchmail.c:1721
#, fuzzy
@@ -1524,7 +1524,7 @@ msgstr " SPAM-blokovanie vypnuté\n"
#: fetchmail.c:1840
#, fuzzy, c-format
msgid " Server connection will be brought up with \"%s\".\n"
-msgstr " Spojenie so servrom bude aktivované s \"%s\".\n"
+msgstr " Spojenie so serverom bude aktivované s \"%s\".\n"
#: fetchmail.c:1843
msgid " No pre-connection command.\n"
@@ -1575,12 +1575,12 @@ msgstr " DNS vyhľadávanie pre multi-drop adresy je %s.\n"
#, fuzzy
msgid ""
" Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr " Prezývky servra budú porovnávané s multi-drop adresami pomocou "
+msgstr " Prezývky servera budú porovnávané s multi-drop adresami pomocou "
#: fetchmail.c:1887
#, fuzzy
msgid " Server aliases will be compared with multidrop addresses by name.\n"
-msgstr " Prezývky servra budú porovnávané s multi-drop adresami pomocou "
+msgstr " Prezývky servera budú porovnávané s multi-drop adresami pomocou "
#: fetchmail.c:1890
#, fuzzy
@@ -1610,7 +1610,7 @@ msgstr " Žiadne odstránenie prefixu\n"
#: fetchmail.c:1907
#, fuzzy
msgid " Predeclared mailserver aliases:"
-msgstr " Preddeklarované prezývky poštového servra:"
+msgstr " Preddeklarované prezývky poštového servera:"
#: fetchmail.c:1915
#, fuzzy
@@ -1717,74 +1717,74 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr ""
-#: gssapi.c:89
+#: gssapi.c:90
#, fuzzy, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "Nemôžem získať názov služby pre [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Používa sa názov služby [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
#, fuzzy
msgid "Sending credentials\n"
msgstr "Posielam osobné údaje\n"
-#: gssapi.c:199
+#: gssapi.c:200
#, fuzzy
msgid "Error exchanging credentials\n"
msgstr "Chyba pri výmene osobných údajov\n"
-#: gssapi.c:241
+#: gssapi.c:242
#, fuzzy
msgid "Couldn't unwrap security level data\n"
msgstr "Nemôžem rozbaliť dáta bezpečnostnej úrovne\n"
-#: gssapi.c:246
+#: gssapi.c:247
#, fuzzy
msgid "Credential exchange complete\n"
msgstr "Výmena osobných údajov kompletná\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "Server vyžaduje integritu a/alebo súkromie\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, fuzzy, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Rozbalené príznaky bezpečnostnej úrovne: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, fuzzy, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "Maximálna veľkosť GSS symbolu je %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Chyba pri vytváraní žiadosti bezpečnostnej úrovne\n"
-#: gssapi.c:287
+#: gssapi.c:288
#, fuzzy
msgid "Releasing GSS credentials\n"
msgstr "Uvoľňujem osobné údaje GSS\n"
-#: gssapi.c:291
+#: gssapi.c:292
#, fuzzy
msgid "Error releasing credentials\n"
msgstr "Chyba pri uvoľňovaní osobných údajov\n"
@@ -1826,102 +1826,102 @@ msgstr "Protokol identifikovaný ako IMAP2 alebo IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "bude nečinný po stiahnutí\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr ""
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr ""
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
-#: imap.c:593
+#: imap.c:586
#, fuzzy
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Požadovaná funkcia OTP nebola preložená do fetchmail-u\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
#, fuzzy
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Požadovaná funkcia NTLM nebola preložená do fetchmail-u\n"
-#: imap.c:622
+#: imap.c:615
#, fuzzy
msgid "Required LOGIN capability not supported by server\n"
-msgstr "Požadovaná funkcia LOGIN nie je podporovaná servrom\n"
+msgstr "Požadovaná funkcia LOGIN nie je podporovaná serverom\n"
-#: imap.c:686
+#: imap.c:679
#, fuzzy, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "správa %s@%s:%d nemala očakávanú dĺžku (%d aktuálne != %d očakávané)\n"
-#: imap.c:825
+#: imap.c:818
#, fuzzy, c-format
msgid "%lu is unseen\n"
msgstr "%u je neprečítaných\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, fuzzy, c-format
msgid "%u is unseen\n"
msgstr "%u je neprečítaných\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
#, fuzzy
msgid "re-poll failed\n"
msgstr "stiahnutie zlyhalo\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, fuzzy, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d správ čaká po stiahnutí\n"
msgstr[1] "%d správ čaká po stiahnutí\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "výber poštového priečinka zlyhal\n"
-#: imap.c:953
+#: imap.c:946
#, fuzzy, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d správ čaká po prvom stiahnutí\n"
msgstr[1] "%d správ čaká po prvom stiahnutí\n"
-#: imap.c:967
+#: imap.c:960
#, fuzzy
msgid "expunge failed\n"
msgstr "vymazanie zlyhalo\n"
-#: imap.c:971
+#: imap.c:964
#, fuzzy, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d správ čaká po prvom vymazaní\n"
msgstr[1] "%d správ čaká po prvom vymazaní\n"
-#: imap.c:1010
+#: imap.c:1003
#, fuzzy
msgid "search for unseen messages failed\n"
msgstr "vyhľadávanie neprečítaných správ zlyhalo\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, fuzzy, c-format
msgid "%u is first unseen\n"
msgstr "%u je prvá neprečítaná\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2122,7 +2122,7 @@ msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr "Nepodarilo sa dekódovať OTP výzvu\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Tajné heslo: "
@@ -2451,80 +2451,80 @@ msgstr ""
msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr ""
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr ""
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr ""
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr ""
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr ""
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr ""
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr ""
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr ""
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr ""
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr ""
-#: pop3.c:836
+#: pop3.c:831
#, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr ""
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "chyba protokolu\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr ""
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr ""
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr "Voľba --folder nie je podporovaná s POP3\n"
@@ -2794,123 +2794,123 @@ msgstr ""
msgid "mail from %s bounced to %s\n"
msgstr ""
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr ""
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr ""
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr ""
-#: sink.c:745
+#: sink.c:735
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "Otvorenie súboru BSMTP zlyhalo: %s\n"
-#: sink.c:791
+#: sink.c:781
#, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr ""
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr ""
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr ""
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr ""
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr ""
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr ""
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr ""
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr ""
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr ""
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr ""
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr ""
-#: sink.c:1383
+#: sink.c:1373
#, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr ""
-#: sink.c:1408
+#: sink.c:1398
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr ""
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr ""
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr ""
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr ""
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr ""
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr ""
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr ""
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3188,22 +3188,22 @@ msgstr ""
msgid "Cygwin socket read retry failed!\n"
msgstr ""
-#: transact.c:65
+#: transact.c:71
#, c-format
msgid "mapped address %s to local %s\n"
msgstr ""
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr ""
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr ""
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3212,71 +3212,92 @@ msgstr ""
"analýza riadka Received:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, fuzzy, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
-msgstr "riadok akceptovaný, %s je alias poštového servra\n"
+msgstr "riadok akceptovaný, %s je alias poštového servera\n"
-#: transact.c:269
+#: transact.c:275
#, fuzzy, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
-msgstr "riadok zamietnutý, %s nie je alias poštového servra\n"
+msgstr "riadok zamietnutý, %s nie je alias poštového servera\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "nenájdená adresa Received\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "nájdená adresa Received `%s'\n"
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr "nesprávny riadok hlavičky nájdený pri prezeraní hlavičiek\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "riadok: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"analýza riadka Received:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, fuzzy, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "žiadne lokálne zhody, posielam na %s\n"
-#: transact.c:1152
+#: transact.c:1180
#, fuzzy
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "odoslanie a zmazanie odložené kvôli DNS chybám\n"
-#: transact.c:1263
+#: transact.c:1291
#, fuzzy
msgid "writing RFC822 msgblk.headers\n"
msgstr "zápis msgblk.hlavičiek RFC822\n"
-#: transact.c:1282
+#: transact.c:1310
#, fuzzy
msgid "no recipient addresses matched declared local names"
msgstr "žiadna adresa príjemcu nezodpovedá zadaným lokálnym menám"
-#: transact.c:1289
+#: transact.c:1317
#, fuzzy, c-format
msgid "recipient address %s didn't match any local name"
msgstr "adresa príjemcu %s nezodpovedá žiadnemu lokálnemu menu"
-#: transact.c:1298
+#: transact.c:1326
#, fuzzy
msgid "message has embedded NULs"
msgstr "správa obsahuje NUL-y"
-#: transact.c:1306
+#: transact.c:1334
#, fuzzy
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP prijímač zamietol lokálne adresy príjemcu: "
-#: transact.c:1445
+#: transact.c:1473
#, fuzzy
msgid "error writing message text\n"
msgstr "zápis textu správy\n"
diff --git a/po/sq.po b/po/sq.po
index 9f1e6bfe..d986ccf4 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail-6.3.8\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2008-02-29 00:24+0200\n"
"Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
"Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -1699,69 +1699,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "gabim %cMTP: %s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "Nuk arrita të kem emër shërbimi për [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Po përdor emër shërbimi [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "Po dërgoj kredenciale\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Gabim gjatë shkëmbimit të kredencialeve\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "Nuk munda të hap të dhëna niveli sigurie\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "Shkëmbim kredencialesh i plotësuar\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "Shërbyesi lyp integritet dhe/ose vetësi\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Hapa shenja niveli sigurie: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "Madhësia më e madhe për \"token\" GSS është %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Gabim në krijim kërkese niveli sigurie\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "Po jap kredenciale GSS\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Gabim dhënieje kredencialesh\n"
@@ -1801,97 +1801,97 @@ msgstr "Protokoll i identifikuar si IMAP2 ose IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "do të rrijë bosh pas vjeljeje\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr ""
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr ""
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Aftësi e nevojshme OTP e papërpiluar tek fetchmail-i\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Aftësi e nevojshme NTML e papërpiluar tek fetchmail-i\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "Aftësi e nevojshme LOGIN e pambuluar prej shërbyesit\n"
-#: imap.c:686
+#: imap.c:679
#, fuzzy, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr ""
"mesazhi %s@%s:%d nuk pat gjatësinë e pritur (%d aktualja != %d e pritshmja)\n"
-#: imap.c:825
+#: imap.c:818
#, fuzzy, c-format
msgid "%lu is unseen\n"
msgstr "%u është i pavërejtur\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u është i pavërejtur\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "rivjelja dështoi\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d mesazh në pritje pas rivjeljes\n"
msgstr[1] "%d mesazhe në pritje pas rivjeljes\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "përzgjedhja e kutisë postare dështoi\n"
-#: imap.c:953
+#: imap.c:946
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d mesazh në pritje pas vjeljes së parë\n"
msgstr[1] "%d mesazhe në pritje pas vjeljes së parë\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "shuarja dështoi\n"
-#: imap.c:971
+#: imap.c:964
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d mesazh në pritje pas shuarjes\n"
msgstr[1] "%d mesazhe në pritje pas shuarjes\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "kërkimi për mesazhe të pavërejtur dështoi\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u është i pari i pavërejtur\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2087,7 +2087,7 @@ msgstr ""
msgid "Could not decode OTP challenge\n"
msgstr ""
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Frazë pass sekrete: "
@@ -2427,7 +2427,7 @@ msgstr " -r, --folder cakto emër dosjeje të largët\n"
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots shfaq pika përparimi edhe në kartela regjistrimi\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2435,75 +2435,75 @@ msgstr ""
"Kujdes: U gjet \"Maillennium POP3/PROXY server\", po përdor urdhrin RETR në "
"vend të TOP.\n"
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr ""
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr ""
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Nuk u gjet vulë kohore e nevojshme APOP në përshëndetje\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "Gabim sintakse vule kohore në përshëndetje\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr ""
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Kërkesë protokolli e papërcaktuar në POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr ""
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr ""
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr "Shërbyesi u përgjigj me UID për mesazh të gabuar.\n"
-#: pop3.c:836
+#: pop3.c:831
#, fuzzy, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) qe fshirë, por është ende i pranishëm!\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"Mesazhe të futur në një listë te shërbyesi. Nuk mund ta bëj dot këtë.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "gabim protokolli\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "gabim protokolli gjatë sjelljes së UIDL-ve\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) qe fshirë, por është ende i pranishëm!\n"
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr "Mundësia --dosje nuk mbulohet me POP3\n"
@@ -2780,123 +2780,123 @@ msgstr "SMTP: (tekst mesazhi kërcimesh)\n"
msgid "mail from %s bounced to %s\n"
msgstr "postë prej %s kërceu për te %s\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "Gabimi i ruajtur është ende %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "gabim %cMTP: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr ""
-#: sink.c:745
+#: sink.c:735
#, fuzzy, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "Dështoi hapja e kartelës BSMTP ose shkrimi i parathënies\n"
-#: sink.c:791
+#: sink.c:781
#, fuzzy, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "Dështoi hapja e kartelës BSMTP ose shkrimi i parathënies\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "Dëgjesi %cMTP nuk e pëlqen vendndodhjen e marrësit `%s'\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "dëgjuesi %cMTP nuk e ka dhe aq qejf vendndodhjen e marrësit `%s'\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "pa përputhje vendndodhjesh; s'është caktuar \"postmaster\".\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "s'mund as të dërgoj te %s!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "pa përputhje vendndodhjesh; po përcjell drejt %s.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "gati për të shpërndarë me: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, fuzzy, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr "S'riemërtoj dot kartelën fetchids %s si %s: %s\n"
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "Hapja e MDA-s dështoi\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "Lidhja %cMTP me %s dështoi\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "s'ia dal dot me dëgjuesin; po rikthehem te %s"
-#: sink.c:1383
+#: sink.c:1373
#, fuzzy, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "Dështoi përfundim mesazhi ose mbyllje e kartelës BSMTP\n"
-#: sink.c:1408
+#: sink.c:1398
#, fuzzy, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Gabim në fshirjen e kartelës \"%s\": %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA-ja vdiq nga sinjali %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA riktheu gjendje jo zero %d\n"
-#: sink.c:1417
+#: sink.c:1407
#, fuzzy, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr "Çudi: MDA pclose riktheu %d, nuk mund të trajtojë %s:%d\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "Dëgjuesi SMTP nuk pranoi shpërndarjen\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "Gabim shpërndarjeje LMTP në EOM\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Përgjigje jo-503 e papritur për LMTP EOM: %s\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3182,22 +3182,22 @@ msgstr "Riprovë për lexim prej një \"socket\"-i Cygwin\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "Leximi dhe shkrimi prej një \"socket\"-i Cygwin dështuan!\n"
-#: transact.c:65
+#: transact.c:71
#, fuzzy, c-format
msgid "mapped address %s to local %s\n"
msgstr "kalova %s te %s vendore\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "kalova %s te %s vendore\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr ""
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3206,66 +3206,87 @@ msgstr ""
"po analizoj rreshtin Të Marrë:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "rresht i pranuar, %s është një alias i shërbyesit postar\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "rresht i papranuar, %s nuk është një alias i shërbyesit postar\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "nuk u gjet vendndodhje Të Marrë\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "u gjet vendndodhje Të Marrë `%s'\n"
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr "u gjet rresht i pasaktë titulli ndërkohë që skanoheshin titujt\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "rreshti: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"po analizoj rreshtin Të Marrë:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "pa përputhje vendore, po përcjell te %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "përcjellje dhe fshirje lënë përgjysmë për shkak gabimesh DNS\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "po shkruaj tituj RFC822 msgblk\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr "asnjë vendndodhje marrësi nuk përputhet me emra vendorë të deklaruar"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "vendndodhja e marrësit %s nuk u përputh me ndonjë emër vendor"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "mesazhi ka NULe të trupëzuar"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "dëgjuesi SMTP hodhi tej vendndodhje vendore marrësish: "
-#: transact.c:1445
+#: transact.c:1473
#, fuzzy
msgid "error writing message text\n"
msgstr "po shkruaj tekst mesazhi\n"
diff --git a/po/tr.po b/po/tr.po
index ec8e524d..1ef4c83e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.2.5\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
"PO-Revision-Date: 2003-10-17 17:27+0200\n"
"Last-Translator: Engin Gndz <engin@ripe.net>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -1748,69 +1748,69 @@ msgstr ""
msgid "GSSAPI error %s: %.*s\n"
msgstr "%cMTP hatas: %s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "[%s] iin hizmet ad alnamad\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Hizmet ad olarak [%s] kullanlyor\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "Credential'lar gnderiliyor\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Credential takasnda hata\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "Gvenlik dzeyi verisi elde edilemedi\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "Crendential takas tamamland\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "Sunucu i tutarllk ve/ya da mahremiyet gerektiriyor\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Gvenlik dzeyi bayraklar: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "En byk GSS token boyutu %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Gvenlik dzeyi isteini olutururken hata\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "GSS credential'lar braklyor\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Credential'lar braklrken hata\n"
@@ -1850,98 +1850,98 @@ msgstr "Protokol IMAP2 ya da IMAP2BIS olarak belirlendi\n"
msgid "will idle after poll\n"
msgstr "yoklamadan sonra idle kalnacak\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr ""
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr ""
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "fetchmail gerekli OTP destei ile derlenmemi\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "fetchmail gerekli NTLM destei ile derlenmemi\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "Sunucu gerekli LOGIN yeteneini desteklemiyor\n"
-#: imap.c:686
+#: imap.c:679
#, fuzzy, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr ""
"%s@%s:%d iletisinin uzunluu beklendii kadar deil (gerekte %d != beklenen "
"%d)\n"
-#: imap.c:825
+#: imap.c:818
#, fuzzy, c-format
msgid "%lu is unseen\n"
msgstr "%u grlmemi\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u grlmemi\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "yeniden yoklama baarsz oldu\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, fuzzy, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "yeniden yokladktan sonra %d ileti bekliyor\n"
msgstr[1] "yeniden yokladktan sonra %d ileti bekliyor\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "posta kutusu seimi baarsz oldu\n"
-#: imap.c:953
+#: imap.c:946
#, fuzzy, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "ilk yoklamadan sonra %d ileti bekliyor\n"
msgstr[1] "ilk yoklamadan sonra %d ileti bekliyor\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "silme baarsz oldu\n"
-#: imap.c:971
+#: imap.c:964
#, fuzzy, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "silinmeden sonra %d ileti bekliyor\n"
msgstr[1] "silinmeden sonra %d ileti bekliyor\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "grlmemi iletileri arama ilemi baarsz oldu\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u ilk grlmemi\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr ""
@@ -2138,7 +2138,7 @@ msgstr "sunucu recv lmcl\n"
msgid "Could not decode OTP challenge\n"
msgstr "OPT challenge'nn kodu zlemedi\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Parola: "
@@ -2480,82 +2480,82 @@ msgstr ""
" --showdots ilerlemeyi gsteren noktalar kayt dosyalarnda bile "
"gster\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr ""
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr ""
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr ""
# timestamp = zaman damgas (zaman belirteci daha doal olurdu bence ama byle kullanlm
# baka yerlerde)
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Gerekli olan APOP zaman damgas selamlama ierisinde bulunamad\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "Selamlama iindeki zaman damgasnda szdizim yanl var\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr ""
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "POP3_auth'ta tanmlanmam protokol istei\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "kilit megul! Baka bir oturum ak olabilir\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr ""
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr ""
-#: pop3.c:836
+#: pop3.c:831
#, fuzzy, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) silinmiti, fakat hala burada!\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "Sunucuda listeye iletiler araya sokulmu. Bu durumu idare edemem.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "protokol hatas\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "UIDL'leri getirirken protokol hatas\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) silinmiti, fakat hala burada!\n"
-#: pop3.c:1424
+#: pop3.c:1419
#, fuzzy
msgid "Option --folder is not supported with POP3\n"
msgstr "--remote seenei POP3 ile desteklenmiyor\n"
@@ -2835,127 +2835,127 @@ msgstr "SMTP: ('bounce' iletisi gvdesi)\n"
msgid "mail from %s bounced to %s\n"
msgstr "%s'den gelen ileti %s'e `bounce' edildi\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "Kaydedilen hata hala %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "%cMTP hatas: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr ""
-#: sink.c:745
+#: sink.c:735
#, fuzzy, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "BSMTP dosya alamad ya da nsz yazlamad\n"
-#: sink.c:791
+#: sink.c:781
#, fuzzy, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "BSMTP dosya alamad ya da nsz yazlamad\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "%cMTP dinleyicisi alc adresi olarak `%s'i sevmedi\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "%cMTP dinleyicisi alc adresi olarak `%s'i sevmedi\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "hibir adres uyumad; postmaster yok.\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr ""
"%s'e bile gnderilemedi!\n"
"\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "hibir adres uymuyor; %s'e iletiyorum.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "iletmek zereyim: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr ""
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr ""
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "MDA ama baarsz oldu\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "%2$s'e %1$cMTP balants baarsz oldu\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "dinleyici altrlamad; %s denenecek"
-#: sink.c:1383
+#: sink.c:1373
#, fuzzy, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr ""
"letiyi bitirme ya da BSMTP dosyasn kapatma ilemi baarszlkla "
"sonuland\n"
-#: sink.c:1408
+#: sink.c:1398
#, fuzzy, c-format
msgid "Error writing to MDA: %s\n"
msgstr "%s'e iletiliyor\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA %d sinyali ile ldrld\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA sfrdan baka bir durum kodu dndrd (%d)\n"
-#: sink.c:1417
+#: sink.c:1407
#, fuzzy, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr "Garip: MDA pclose durum kodu olarak %d dndrd, %s:%d'de sorun\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "SMTP dinleyicisi datm reddetti\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "leti sonunda LMTP datm hatas\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "LMTP EOM'a beklenmeyen, 503 olmayan yant: %s\n"
-#: sink.c:1630
+#: sink.c:1620
#, fuzzy
msgid ""
"-- \n"
@@ -3242,23 +3242,23 @@ msgstr "Cygwin soketinden okuma yeniden deneniyor\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "Cygwin soketinden okuma baarsz oldu!\n"
-#: transact.c:65
+#: transact.c:71
#, fuzzy, c-format
msgid "mapped address %s to local %s\n"
msgstr "%s yerel %s'e elendi\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "%s yerel %s'e elendi\n"
# kaynak koduna baklacak
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "%2$s ile uyuan %1$s geirildi\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3267,69 +3267,90 @@ msgstr ""
"'Received' satr zmleniyor:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "satr kabul edildi, %s posta sunucusu iin bir takma ad\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "satr kabul edilmedi, %s posta sunucusu iin bir takma ad deil\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "hibir Received adresi bulunamad\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "`%s' Received adresi bulundu\n"
# delimiter = snr belirteci (Sankur'un szlnden)
-#: transact.c:595
+#: transact.c:601
#, fuzzy
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr "balklar taranrken geersiz balk satr bulundu\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "satr: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"'Received' satr zmleniyor:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "yerelde uyan bulunamad, %s'e iletiliyor\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "iletme ve silme DNS hatalar nedeniyle yaplmyor\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "RFC822 msgblk.headers yazlyor\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr ""
"alc adreslerinden hibiri bildirilen yerel adlardan hibirine uymuyor"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "alc adresi %s yerel adlardan hibirine uymuyor"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "iletinin iinde NUL karakterleri var"
# listener = dinleyici
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP dinleyicisi yerel alc adreslerini reddetti: "
-#: transact.c:1445
+#: transact.c:1473
#, fuzzy
msgid "error writing message text\n"
msgstr "ileti metni yazlyor\n"
diff --git a/po/vi.po b/po/vi.po
index 4bd8ad48..81104417 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.17-pre1\n"
+"Project-Id-Version: fetchmail 6.3.18-pre2\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
-"PO-Revision-Date: 2010-05-03 18:18+0930\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
+"PO-Revision-Date: 2010-09-28 19:20+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -271,6 +271,8 @@ msgstr " (đã cho quyền trước này)"
#: driver.c:1192
msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
msgstr ""
+"Để tìm trợ giúp, xem phần Hỏi Đáp: http://www.fetchmail.info/fetchmail-FAQ."
+"html#R15\n"
#: driver.c:1213
#, c-format
@@ -1642,76 +1644,79 @@ msgstr ""
#: gssapi.c:52
#, c-format
msgid "GSSAPI error in gss_display_status called from <%s>\n"
-msgstr ""
+msgstr "Lỗi GSSAPI trong gss_display_status được gọi từ <%s>\n"
#: gssapi.c:55
-#, fuzzy, c-format
+#, c-format
msgid "GSSAPI error %s: %.*s\n"
-msgstr "Lỗi %cMTP: %s\n"
+msgstr "Lỗi GSSAPI %s: %.*s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "Không thể lấy tên dịch vụ cho [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "Đang dùng tên dịch vụ [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr ""
+"Không tìm thấy thông tin xác thực GSSAPI nên bỏ qua bước xác thực GSSAPI.\n"
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr ""
+"Muốn sử dụng GSSAPI thì trước tiên yêu cầu thông tin xác thực, có thể là từ "
+"kinit.\n"
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
msgstr ""
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
-msgstr "Đang gởi thông tin sác thực...\n"
+msgstr "Đang gởi thông tin xác thực...\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "Gặp lỗi khi trao đổi thông tin xác thực\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "Không thể mở bọc dữ liệu cấp bảo mật\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "Việc trao đổi thông tin xác thực là hoàn thành\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "Máy phục vụ cần thiết sự tích hợp và/hay sự riêng tự\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Các cờ cấp bảo mật đã mở bọc: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "Kích cỡ hiệu bài GSS tối đa là %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "Gặp lỗi khi tạo yêu cầu cấp bảo mật\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "Đang phát hành thông tin xác thực GSS...\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "Gặp lỗi khi phát hành thông tin xác thực\n"
@@ -1751,100 +1756,100 @@ msgstr "Giao thức được phát hiện là IMAP2 hay IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "sẽ nghỉ sau khi thăm dò\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: việc nâng cấp lên TLS đã thành công.\n"
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: việc nâng cấp lên TLS bị lỗi.\n"
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr ""
"%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa bị lỗi nên thử tiếp tục\n"
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Khả năng OTP cần thiết không được biên dịch vào fetchmail\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Khả năng NTLM cần thiết không được biên dịch vào fetchmail\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr ""
"Khả năng LOGIN (đăng nhập) cần thiết không được hỗ trợ bởi máy phục vụ\n"
-#: imap.c:686
+#: imap.c:679
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "không khớp được khi xoá hẳn thư (%d thật != %d ngờ)\n"
-#: imap.c:825
+#: imap.c:818
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu chưa xem\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u chưa xem\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "việc thăm dò lại bị lỗi\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "%d thư đợi sau khi thăm dò lại\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "việc chọn hộp thư bị lỗi\n"
-#: imap.c:953
+#: imap.c:946
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "%d thư đợi sau khi thăm dò lần thứ nhất\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "việc xoá hẳn bị lỗi\n"
-#: imap.c:971
+#: imap.c:964
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "%d thư đợi sau khi xoá hẳn\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "việc tìm kiếm các thư chưa xem bị lỗi\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u là thư đầu chưa xem\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr ""
"Cảnh báo : đang bỏ qua dữ liệu giả về kích cỡ các thư bị máy phục vụ trả "
"về.\n"
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
-msgstr ""
+msgstr "Sai đáp ứng FETCH (lấy): %s.\n"
#: interface.c:256
msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
@@ -2036,7 +2041,7 @@ msgstr "recv (nhận) của máy phục vụ là nghiêm trọng\n"
msgid "Could not decode OTP challenge\n"
msgstr "Không thể giải mã yêu cầu OTP\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "Cụm từ mật khẩu bí mật: "
@@ -2401,7 +2406,7 @@ msgid " --showdots show progress dots even in logfiles\n"
msgstr ""
" --showdots _hiện các chấm_ tiến hành ngay cả trong tập tin ghi lưu\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
@@ -2409,81 +2414,81 @@ msgstr ""
"Cảnh báo : tìm thấy « Maillennium POP3/PROXY server » nên dùng lệnh RETR thay "
"vào TOP.\n"
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr ""
"Bắt buộc phải sử dụng TLS trong phiên chạy này mà trình phục vụ đã từ chối "
"lệnh CAPA.\n"
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr "Còn lệnh CAPA cần thiết cho TLS.\n"
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr ""
"%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa bị lỗi nên thử tiếp "
"tục.\n"
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr "Hết các bộ xác thực được phép nên không thể tiếp tục.\n"
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Không tìm thấy nhãn thời gian APOP cần thiết trong lời chào mừng\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "Gặp lỗi cú pháp nhãn thời gian trong lời chào mừng\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr "Nhãn giờ APOP không hợp lệ.\n"
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr ""
"Gặp yêu cầu giao thức không được xác định trong « POP3_auth » (xác thực)\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "khoá bận ! Có phiên chạy khác hoạt động không?\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "Không thể xử lý đáp ứng UIDL từ máy phục vụ nguồn.\n"
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr "Máy phục vụ đã đáp ứng UID cho thư không đúng.\n"
-#: pop3.c:836
+#: pop3.c:831
#, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (số=%u) đã được xoá bỏ, nhưng còn có !\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr ""
"Gặp thư được chèn vào danh sách trên máy phục vụ. Không thể xử lý trường hợp "
"này.\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "lỗi giao thức\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "gặp lỗi giao thức khi lấy các UIDL\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (số=%d) đã được xoá bỏ, nhưng còn có.\n"
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr "Không hỗ trợ tùy chọn « --folder » (thư mục) với POP3\n"
@@ -2757,104 +2762,104 @@ msgstr "SMTP: (thân thư nảy về)\n"
msgid "mail from %s bounced to %s\n"
msgstr "thư từ %s đã nảy về %s\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "Lỗi đã lưu vẫn còn là %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "Lỗi %cMTP: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr "Trình phục vụ SMTP yêu cầu STARTTLS, vẫn giữ thư.\n"
-#: sink.c:745
+#: sink.c:735
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "Việc mở tập tin BSMTP bị lỗi: %s\n"
-#: sink.c:791
+#: sink.c:781
#, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "Việc ghi lời mở đầu BSMTP bị lỗi: %s.\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "Bộ lắng nghe %cMTP không chấp nhận địa chỉ người nhận « %s »\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "Bộ lắng nghe %cMTP không thật chấp nhận địa chỉ người nhận « %s »\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "không có địa chỉ khớp; chưa đặt giám đốc sở bưu điện.\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "không thể gởi ngay cả cho %s.\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "không có địa chỉ khớp; đang chuyển tiếp tới %s.\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "sắp phát với: %s\n"
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr "Không thể chuyển đổi mã số người dùng hiệu quả sang %ld: %s\n"
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr "Không thể chuyển đổi mã số người dùng hiệu quả về %ld gốc: %s\n"
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "Việc mở MDA bị lỗi\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "Việc kết nối %cMTP đến %s bị lỗi\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "không thể liên lạc với bộ lắng nghe nên dự trữ về %s"
-#: sink.c:1383
+#: sink.c:1373
#, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "Việc kết thúc thư hay đóng tập tin BSMTP bị lỗi: %s\n"
-#: sink.c:1408
+#: sink.c:1398
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Gặp lỗi khi ghi vào MDA: %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA đã kết thúc vì tín hiệu %d\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA đã trả về trạng thái không phải số không %d\n"
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
@@ -2862,20 +2867,20 @@ msgstr ""
"Lạ : việc pclose MDA đã trả lại %d và số hiệu lỗi %d/%s nên không thể xử lý "
"tại %s:%d\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "Bộ lắng nghe SMTP đã từ chối việc phát\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "Lỗi phát LMTP tại kết thúc thư\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Gặp đáp ứng không phải 503 không mong đợi với kết thúc thư LMTP: %s\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -2965,9 +2970,9 @@ msgid "cannot create socket: %s\n"
msgstr "không thể tạo ổ cắm: %s.\n"
#: socket.c:317
-#, fuzzy, c-format
+#, c-format
msgid "name %d: cannot create socket family %d type %d: %s\n"
-msgstr "không thể tạo ổ cắm: %s.\n"
+msgstr "tên %d: không thể tạo nhóm ổ cắm %d kiểu %d: %s\n"
#: socket.c:333
msgid "connection failed.\n"
@@ -2979,9 +2984,9 @@ msgid "connection to %s:%s [%s/%s] failed: %s.\n"
msgstr "lỗi kết nối đến %s:%s [%s/%s]: %s.\n"
#: socket.c:336
-#, fuzzy, c-format
+#, c-format
msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
-msgstr "lỗi kết nối đến %s:%s [%s/%s]: %s.\n"
+msgstr "tên %d: lỗi kết nối đến %s:%s [%s/%s]: %s.\n"
#: socket.c:342
msgid "connected.\n"
@@ -2993,6 +2998,8 @@ msgid ""
"Connection errors for this poll:\n"
"%s"
msgstr ""
+"Lỗi kết nối cho lần thăm dò này:\n"
+"%s"
#: socket.c:621
msgid "Server certificate:\n"
@@ -3165,22 +3172,22 @@ msgstr "Việc cố lại đọc ổ cắm Cygwin\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "Việc cố lại đọc ổ cắm Cygwin bị lỗi.\n"
-#: transact.c:65
+#: transact.c:71
#, c-format
msgid "mapped address %s to local %s\n"
msgstr "đã ảnh xạ địa chỉ %s thành %s cục bộ\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "đã ảnh xạ %s thành %s cục bộ\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "đã đi qua %s khớp %s\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3189,66 +3196,88 @@ msgstr ""
"đang phân tích dòng Received (Đã nhận):\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "dòng đã được chấp nhận, %s là bí danh của máy phục vụ thư\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "dòng bị từ chối, %s không phải là bí danh của máy phục vụ thư\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "không tìm thấy địa chỉ Received (Đã nhận)\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "tìm thấy địa chỉ Received (Đã nhận) « %s »\n"
-#: transact.c:595
-#, fuzzy
+#: transact.c:601
msgid "incorrect header line found - see manpage for bad-header option\n"
-msgstr "tìm thấy dòng đầu không đúng trong khi quét các dòng đầu\n"
+msgstr ""
+"tìm được dòng đầu không đúng: xem trang hướng dẫn (man) về tuỳ chọn dòng đầu "
+"sai (bad-header)\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "dòng: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"đang phân tích dòng Received (Đã nhận):\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "không khớp gì cục bộ nên chuyển tiếp tới %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "khả năng chuyển tiếp và xoá bỏ đã được thu hồi vì gặp nhiều lỗi DNS\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "đang ghi msgblk.headers RFC822\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr "không có địa chỉ người nhận khớp với tên cục bộ đã xác định"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "địa chỉ người nhận %s không khớp với tên cục bộ đã xác định nào"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "thư có NUL nhúng"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "Bộ lắng nghe SMTP đã từ chối các địa chỉ người nhận cục bộ : "
-#: transact.c:1445
+#: transact.c:1473
msgid "error writing message text\n"
msgstr "gặp lỗi khi ghi thân thư\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d9154526..d7eab275 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.18-pre1\n"
+"Project-Id-Version: fetchmail 6.3.18\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-10-09 13:33+0200\n"
-"PO-Revision-Date: 2010-09-19 14:34+0800\n"
+"POT-Creation-Date: 2010-12-05 01:17+0100\n"
+"PO-Revision-Date: 2010-10-12 18:27+0000\n"
"Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -267,7 +267,7 @@ msgstr "(事先已授权)"
#: driver.c:1192
msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
+msgstr "寻求帮助请访问 http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
#: driver.c:1213
#, c-format
@@ -1130,9 +1130,8 @@ msgid " OTP authentication will be forced.\n"
msgstr " 强制 OTP 验证\n"
#: fetchmail.c:1651
-#, fuzzy
msgid " CRAM-MD5 authentication will be forced.\n"
-msgstr " 强制 CRAM-Md5 验证\n"
+msgstr " 强制 CRAM-MD5 验证\n"
#: fetchmail.c:1654
msgid " GSSAPI authentication will be forced.\n"
@@ -1587,73 +1586,73 @@ msgid "GSSAPI error in gss_display_status called from <%s>\n"
msgstr "来自 <%s> 的 gss_display_status 调用中有 GSSAPI 错误\n"
#: gssapi.c:55
-#, fuzzy, c-format
+#, c-format
msgid "GSSAPI error %s: %.*s\n"
-msgstr "GSSAPI 出错: %s: %s\n"
+msgstr "GSSAPI 错误 %s: %.*s\n"
-#: gssapi.c:89
+#: gssapi.c:90
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "无法获得服务 [%s]\n"
-#: gssapi.c:94
+#: gssapi.c:95
#, c-format
msgid "Using service name [%s]\n"
msgstr "正在使用服务 [%s]\n"
-#: gssapi.c:121
+#: gssapi.c:122
msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
msgstr "未找到合适的 GSSAPI 证书。忽略 GSSAPI 认证。\n"
-#: gssapi.c:122
+#: gssapi.c:123
msgid ""
"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
msgstr "如您想使用 GSSAPI,您首先需要证书,也许来自 kinit。\n"
-#: gssapi.c:158
+#: gssapi.c:159
#, c-format
msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
-msgstr ""
+msgstr "接收到怪异的请求 \"%s GSSAPI\"!\n"
-#: gssapi.c:168
+#: gssapi.c:169
msgid "Sending credentials\n"
msgstr "正在发送证书\n"
-#: gssapi.c:199
+#: gssapi.c:200
msgid "Error exchanging credentials\n"
msgstr "交换证书时出错\n"
-#: gssapi.c:241
+#: gssapi.c:242
msgid "Couldn't unwrap security level data\n"
msgstr "无法解开加密数据\n"
-#: gssapi.c:246
+#: gssapi.c:247
msgid "Credential exchange complete\n"
msgstr "证书交换完成\n"
-#: gssapi.c:250
+#: gssapi.c:251
msgid "Server requires integrity and/or privacy\n"
msgstr "服务器要求完整性和(或)隐私检查\n"
-#: gssapi.c:259
+#: gssapi.c:260
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "解开的加密标识: %s%s%s\n"
-#: gssapi.c:263
+#: gssapi.c:264
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "最大 GSS 标识大小为 %ld\n"
-#: gssapi.c:276
+#: gssapi.c:277
msgid "Error creating security level request\n"
msgstr "创建加密请求时出错\n"
-#: gssapi.c:287
+#: gssapi.c:288
msgid "Releasing GSS credentials\n"
msgstr "正在清空 GSS 证书\n"
-#: gssapi.c:291
+#: gssapi.c:292
msgid "Error releasing credentials\n"
msgstr "清空证书时出错\n"
@@ -1693,93 +1692,93 @@ msgstr "协议被识别为 IMAP2 或 IMAP2BIS\n"
msgid "will idle after poll\n"
msgstr "收件后恢复至 idle 模式\n"
-#: imap.c:464 pop3.c:476
+#: imap.c:461 pop3.c:475
#, c-format
msgid "%s: upgrade to TLS succeeded.\n"
msgstr "%s: 成功升级至 TLS 协议。\n"
-#: imap.c:473 pop3.c:485
+#: imap.c:466 pop3.c:480
#, c-format
msgid "%s: upgrade to TLS failed.\n"
msgstr "%s: 升级至 TLS 协议失败。\n"
-#: imap.c:477
+#: imap.c:470
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
msgstr "%s: 即时升级至 TLS 协议失败,继续尝试\n"
-#: imap.c:593
+#: imap.c:586
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "需要的 OTP 功能未被编译进 fetchmail\n"
-#: imap.c:613 pop3.c:560
+#: imap.c:606 pop3.c:555
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "需要的 NTLM 功能未被编译进 fetchmail\n"
-#: imap.c:622
+#: imap.c:615
msgid "Required LOGIN capability not supported by server\n"
msgstr "需要的 LOGIN 功能未被编译进 fetchmail\n"
-#: imap.c:686
+#: imap.c:679
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "邮件删除数不相等 (实际删除 %d 封!= 已删除 %d 封)\n"
-#: imap.c:825
+#: imap.c:818
#, c-format
msgid "%lu is unseen\n"
msgstr "%lu 封未读\n"
-#: imap.c:889 pop3.c:845 pop3.c:857 pop3.c:1095 pop3.c:1102
+#: imap.c:882 pop3.c:840 pop3.c:852 pop3.c:1090 pop3.c:1097
#, c-format
msgid "%u is unseen\n"
msgstr "%u 未读\n"
-#: imap.c:924 imap.c:983
+#: imap.c:917 imap.c:976
msgid "re-poll failed\n"
msgstr "重新收件失败\n"
-#: imap.c:932 imap.c:988
+#: imap.c:925 imap.c:981
#, c-format
msgid "%d message waiting after re-poll\n"
msgid_plural "%d messages waiting after re-poll\n"
msgstr[0] "重新收件后又有 %d 封邮件等待收取\n"
-#: imap.c:949
+#: imap.c:942
msgid "mailbox selection failed\n"
msgstr "邮箱选择失败\n"
-#: imap.c:953
+#: imap.c:946
#, c-format
msgid "%d message waiting after first poll\n"
msgid_plural "%d messages waiting after first poll\n"
msgstr[0] "首次收件后又有 %d 封邮件等待收取\n"
-#: imap.c:967
+#: imap.c:960
msgid "expunge failed\n"
msgstr "删除操作失败\n"
-#: imap.c:971
+#: imap.c:964
#, c-format
msgid "%d message waiting after expunge\n"
msgid_plural "%d messages waiting after expunge\n"
msgstr[0] "删除操作后有 %d 封邮件等待收取\n"
-#: imap.c:1010
+#: imap.c:1003
msgid "search for unseen messages failed\n"
msgstr "查找未读邮件失败\n"
-#: imap.c:1015 pop3.c:866
+#: imap.c:1008 pop3.c:861
#, c-format
msgid "%u is first unseen\n"
msgstr "%u 是首个未读邮件\n"
-#: imap.c:1099
+#: imap.c:1092
msgid ""
"Warning: ignoring bogus data for message sizes returned by the server.\n"
msgstr "警告: 忽略服务器返回的邮件大小的无效数据。\n"
-#: imap.c:1197 imap.c:1204
+#: imap.c:1190 imap.c:1197
#, c-format
msgid "Incorrect FETCH response: %s.\n"
msgstr "FETCH 响应不正确: %s。\n"
@@ -1974,7 +1973,7 @@ msgstr "服务器 recv 错\n"
msgid "Could not decode OTP challenge\n"
msgstr "无法解码 OTP 请求\n"
-#: opie.c:64 pop3.c:587
+#: opie.c:64 pop3.c:582
msgid "Secret pass phrase: "
msgstr "密码短语:"
@@ -2296,80 +2295,80 @@ msgstr " -r, --folder\t指定远程邮箱名\n"
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots\t即使在日志文件中也要显示进度条(以点的形式)\n"
-#: pop3.c:328
+#: pop3.c:327
msgid ""
"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
"of TOP.\n"
msgstr "警告: 发现“ POP3 代理服务器”,用 RETR 命令代替 TOP。\n"
-#: pop3.c:412
+#: pop3.c:411
msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
msgstr "强制使用 TLS 会话,但服务器拒绝 CAPA 命令。\n"
-#: pop3.c:413
+#: pop3.c:412
msgid "The CAPA command is however necessary for TLS.\n"
msgstr "而 CPAC 命令对于 TLS 协议来说是必须要有的。\n"
-#: pop3.c:496
+#: pop3.c:491
#, c-format
msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
msgstr "%s: 升级到 TLS 协议失败了,继续尝试。\n"
-#: pop3.c:623
+#: pop3.c:618
msgid "We've run out of allowed authenticators and cannot continue.\n"
msgstr "我们已经用完了可用的验证方式,无法继续\n"
-#: pop3.c:637
+#: pop3.c:632
msgid "Required APOP timestamp not found in greeting\n"
msgstr "在 greeting 中未发现所需的 APOP 时间戳\n"
-#: pop3.c:646
+#: pop3.c:641
msgid "Timestamp syntax error in greeting\n"
msgstr "greeting 中时间戳语法错误\n"
-#: pop3.c:662
+#: pop3.c:657
msgid "Invalid APOP timestamp.\n"
msgstr "无效的 APOP 时间戳\n"
-#: pop3.c:686
+#: pop3.c:681
msgid "Undefined protocol request in POP3_auth\n"
msgstr "POP3_auth 中有未定义的协议请求\n"
-#: pop3.c:707
+#: pop3.c:702
msgid "lock busy! Is another session active?\n"
msgstr "死锁!是否有另一个会话在运行?\n"
-#: pop3.c:786
+#: pop3.c:781
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "无法操作来自上游服务器的 UIDL 响应。\n"
-#: pop3.c:809
+#: pop3.c:804
msgid "Server responded with UID for wrong message.\n"
msgstr "响应的服务器带有错误消息的 UID。\n"
-#: pop3.c:836
+#: pop3.c:831
#, c-format
msgid "id=%s (num=%u) was deleted, but is still present!\n"
msgstr "id=%s (数量=%u 封)已被删除,但仍然存在!\n"
-#: pop3.c:942
+#: pop3.c:937
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "邮件被插入服务器列表。无法处理。\n"
-#: pop3.c:1038
+#: pop3.c:1033
msgid "protocol error\n"
msgstr "协议错\n"
-#: pop3.c:1054
+#: pop3.c:1049
msgid "protocol error while fetching UIDLs\n"
msgstr "正在读取 UIDLs 时协议出错\n"
-#: pop3.c:1086
+#: pop3.c:1081
#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id = %s (数量 = %d 封) 已被删除,但仍然存在!\n"
-#: pop3.c:1424
+#: pop3.c:1419
msgid "Option --folder is not supported with POP3\n"
msgstr "POP3 不支持 --folder 选项\n"
@@ -2639,123 +2638,123 @@ msgstr "SMTP: (回送邮件内容)\n"
msgid "mail from %s bounced to %s\n"
msgstr "邮件从 %s 回送至 %s\n"
-#: sink.c:458
+#: sink.c:456
#, c-format
msgid "Saved error is still %d\n"
msgstr "保留的错误仍然为 %d\n"
-#: sink.c:518 sink.c:617
+#: sink.c:508 sink.c:607
#, c-format
msgid "%cMTP error: %s\n"
msgstr "%cMTP 出错: %s\n"
-#: sink.c:562
+#: sink.c:552
msgid "SMTP server requires STARTTLS, keeping message.\n"
msgstr "SMTP 服务器需要 STARTTLS 认证,正在保存邮件。\n"
-#: sink.c:745
+#: sink.c:735
#, c-format
msgid "BSMTP file open failed: %s\n"
msgstr "打开 BSMTP 文件失败: %s\n"
-#: sink.c:791
+#: sink.c:781
#, c-format
msgid "BSMTP preamble write failed: %s.\n"
msgstr "写入 BSMTP 报头失败: %s。\n"
-#: sink.c:1005
+#: sink.c:995
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "%cMTP 端不认可收件人地址 “%s”\n"
-#: sink.c:1012
+#: sink.c:1002
#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
msgstr "%cMTP 端不是真的认可收件人地址 “%s”\n"
-#: sink.c:1058
+#: sink.c:1048
msgid "no address matches; no postmaster set.\n"
msgstr "无匹配的地址;也无 postmaster 设置\n"
-#: sink.c:1070
+#: sink.c:1060
#, c-format
msgid "can't even send to %s!\n"
msgstr "无法稳定发送至 %s!\n"
-#: sink.c:1076
+#: sink.c:1066
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "无匹配的地址;转发至 %s。\n"
-#: sink.c:1232
+#: sink.c:1222
#, c-format
msgid "about to deliver with: %s\n"
msgstr "即将用 %s 投递\n"
-#: sink.c:1243
+#: sink.c:1233
#, c-format
msgid "Cannot switch effective user id to %ld: %s\n"
msgstr "无法将当前用户名切换为 %ld: %s\n"
-#: sink.c:1255
+#: sink.c:1245
#, c-format
msgid "Cannot switch effective user id back to original %ld: %s\n"
msgstr "无法将当前用户名切换回之前的用户名 %ld: %s\n"
-#: sink.c:1262
+#: sink.c:1252
msgid "MDA open failed\n"
msgstr "打开 MDA 失败\n"
-#: sink.c:1301
+#: sink.c:1291
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "%cMTP 连接至 %s 失败\n"
-#: sink.c:1325
+#: sink.c:1315
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "无法启动 MDA 代理;正在转到 MDA 代理 %s"
-#: sink.c:1383
+#: sink.c:1373
#, c-format
msgid "Message termination or close of BSMTP file failed: %s\n"
msgstr "邮件终止或 BSMTP 文件关闭失败: %s\n"
-#: sink.c:1408
+#: sink.c:1398
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "写入 MDA 时出错: %s\n"
-#: sink.c:1411
+#: sink.c:1401
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA 被信号 %d 终止\n"
-#: sink.c:1414
+#: sink.c:1404
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA 返回非零值 %d\n"
-#: sink.c:1417
+#: sink.c:1407
#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
msgstr "奇怪: MDA pclose 返回 %d 且 errno 为 %d/%s,在 %s:%d 无法处理\n"
-#: sink.c:1442
+#: sink.c:1432
msgid "SMTP listener refused delivery\n"
msgstr "SMTP 端拒绝投递\n"
-#: sink.c:1472
+#: sink.c:1462
msgid "LMTP delivery error on EOM\n"
msgstr "邮件结尾时用 LTMP 协议投递错误\n"
-#: sink.c:1475
+#: sink.c:1465
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "邮件结尾时 LMTP 协议的未知的非 503 响应: %s\n"
-#: sink.c:1630
+#: sink.c:1620
msgid ""
"-- \n"
"The Fetchmail Daemon"
@@ -3038,22 +3037,22 @@ msgstr "重试读取 Cygwin 接口\n"
msgid "Cygwin socket read retry failed!\n"
msgstr "重试读取 Cygwin 接口失败!\n"
-#: transact.c:65
+#: transact.c:71
#, c-format
msgid "mapped address %s to local %s\n"
msgstr "地址 %s 被映射至本地 %s\n"
-#: transact.c:87
+#: transact.c:93
#, c-format
msgid "mapped %s to local %s\n"
msgstr "映射 %s 至本地 %s\n"
-#: transact.c:154
+#: transact.c:160
#, c-format
msgid "passed through %s matching %s\n"
msgstr "传送过来的 %s 正与 %s 进行比较\n"
-#: transact.c:224
+#: transact.c:230
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3062,65 +3061,86 @@ msgstr ""
"正在分析 Received 行:\n"
"%s"
-#: transact.c:263
+#: transact.c:269
#, c-format
msgid "line accepted, %s is an alias of the mailserver\n"
msgstr "收到的行中 %s 是邮件服务器的一个昵称\n"
-#: transact.c:269
+#: transact.c:275
#, c-format
msgid "line rejected, %s is not an alias of the mailserver\n"
msgstr "拒收的行中 %s 非邮件服务器的昵称\n"
-#: transact.c:343
+#: transact.c:349
msgid "no Received address found\n"
msgstr "找不到 Received 地址\n"
-#: transact.c:352
+#: transact.c:358
#, c-format
msgid "found Received address `%s'\n"
msgstr "找到 Received 地址 ‘%s’\n"
-#: transact.c:595
+#: transact.c:601
msgid "incorrect header line found - see manpage for bad-header option\n"
msgstr "发现不正确的 header 行,查看手册页中的 bad-header 选项\n"
-#: transact.c:597
+#: transact.c:603
#, c-format
msgid "line: %s"
msgstr "行: %s"
-#: transact.c:1137
+#: transact.c:1095 transact.c:1105
+#, c-format
+msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
+msgstr ""
+
+#: transact.c:1120
+#, fuzzy, c-format
+msgid "Parsing Received names \"%-.*s\"\n"
+msgstr ""
+"正在分析 Received 行:\n"
+"%s"
+
+#: transact.c:1132
+msgid "No envelope recipient found, resorting to header guessing.\n"
+msgstr ""
+
+#: transact.c:1150
+#, c-format
+msgid "Guessing from header \"%-.*s\".\n"
+msgstr ""
+
+#: transact.c:1165
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "无本地匹配的收件人,正在转发至 %s\n"
-#: transact.c:1152
+#: transact.c:1180
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "正在转发且由于 DNS 错误,删除被取消了\n"
-#: transact.c:1263
+#: transact.c:1291
msgid "writing RFC822 msgblk.headers\n"
msgstr "正在重写 RFC822 协议中定义的邮件信息块的头部\n"
-#: transact.c:1282
+#: transact.c:1310
msgid "no recipient addresses matched declared local names"
msgstr "收件人地址与本地已知的用户名不匹配"
-#: transact.c:1289
+#: transact.c:1317
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "收到人地址 %s 与本地任何一个用户名均不匹配"
-#: transact.c:1298
+#: transact.c:1326
msgid "message has embedded NULs"
msgstr "邮件嵌入了 NULs"
-#: transact.c:1306
+#: transact.c:1334
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP 端拒绝本地收件人地址:"
-#: transact.c:1445
+#: transact.c:1473
msgid "error writing message text\n"
msgstr "在写邮件文本时出错\n"