aboutsummaryrefslogtreecommitdiffstats
path: root/po/en_GB.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po2142
1 files changed, 761 insertions, 1381 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 43578a53..39d97c26 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,16 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: fetchmail 6.3.5\n"
-"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2020-10-15 20:10+0200\n"
+"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
+"POT-Creation-Date: 2006-09-27 00:05+0200\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"
-"Language: en_GB\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: checkalias.c:174
@@ -31,17 +30,17 @@ msgstr "Yes, their IP addresses match\n"
msgid "No, their IP addresses don't match\n"
msgstr "No, their IP addresses don't match\n"
-#: checkalias.c:207
+#: checkalias.c:198
#, c-format
msgid "nameserver failure while looking for '%s' during poll of %s: %s\n"
msgstr "nameserver failure while looking for '%s' during poll of %s: %s\n"
-#: checkalias.c:230
+#: checkalias.c:223
#, c-format
msgid "nameserver failure while looking for `%s' during poll of %s.\n"
msgstr "nameserver failure while looking for `%s' during poll of %s.\n"
-#: cram.c:95 ntlmsubr.c:65
+#: cram.c:95
msgid "could not decode BASE64 challenge\n"
msgstr "could not decode BASE64 challenge\n"
@@ -50,155 +49,142 @@ msgstr "could not decode BASE64 challenge\n"
msgid "decoded as %s\n"
msgstr "decoded as %s\n"
-#: driver.c:199
+#: driver.c:191
#, c-format
msgid "kerberos error %s\n"
msgstr "kerberos error %s\n"
-#: driver.c:259 driver.c:265
-#, fuzzy, c-format
-msgid "krb5_sendauth: %s [server says '%s']\n"
+#: driver.c:249 driver.c:254
+#, c-format
+msgid "krb5_sendauth: %s [server says '%*s'] \n"
msgstr "krb5_sendauth: %s [server says '%*s'] \n"
-#: driver.c:345
-#, fuzzy
-msgid "Fetchmail oversized-messages warning"
+#: driver.c:335
+msgid "Subject: Fetchmail oversized-messages warning"
msgstr "Subject: Fetchmail oversized-messages warning"
-#: driver.c:349
+#: driver.c:339
#, c-format
msgid "The following oversized messages were deleted on server %s account %s:"
msgstr "The following oversized messages were deleted on server %s account %s:"
-#: driver.c:353
+#: driver.c:343
#, c-format
msgid "The following oversized messages remain on server %s account %s:"
msgstr "The following oversized messages remain on server %s account %s:"
-#: driver.c:372
-#, fuzzy, c-format
-msgid " %d message %d octets long deleted by fetchmail."
-msgid_plural " %d messages %d octets long deleted by fetchmail."
-msgstr[0] " %d msg %d octets long deleted by fetchmail."
-msgstr[1] " %d msg %d octets long deleted by fetchmail."
+#: driver.c:362
+#, c-format
+msgid " %d msg %d octets long deleted by fetchmail."
+msgstr " %d msg %d octets long deleted by fetchmail."
-#: driver.c:377
-#, fuzzy, c-format
-msgid " %d message %d octets long skipped by fetchmail."
-msgid_plural " %d messages %d octets long skipped by fetchmail."
-msgstr[0] " %d msg %d octets long skipped by fetchmail."
-msgstr[1] " %d msg %d octets long skipped by fetchmail."
+#: driver.c:366
+#, c-format
+msgid " %d msg %d octets long skipped by fetchmail."
+msgstr " %d msg %d octets long skipped by fetchmail."
-#: driver.c:522
+#: driver.c:501
#, c-format
msgid "skipping message %s@%s:%d"
msgstr "skipping message %s@%s:%d"
-#: driver.c:577
+#: driver.c:555
#, c-format
msgid "skipping message %s@%s:%d (%d octets)"
msgstr "skipping message %s@%s:%d (%d octets)"
-#: driver.c:593
+#: driver.c:571
msgid " (length -1)"
msgstr " (length -1)"
-#: driver.c:596
+#: driver.c:574
msgid " (oversized)"
msgstr " (oversized)"
-#: driver.c:614
+#: driver.c:589
#, c-format
msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
msgstr "couldn't fetch headers, message %s@%s:%d (%d octets)\n"
-#: driver.c:632
+#: driver.c:606
#, c-format
msgid "reading message %s@%s:%d of %d"
msgstr "reading message %s@%s:%d of %d"
-#: driver.c:637
+#: driver.c:611
#, c-format
msgid " (%d octets)"
msgstr " (%d octets)"
-#: driver.c:638
+#: driver.c:612
#, c-format
msgid " (%d header octets)"
msgstr " (%d header octets)"
-#: driver.c:708
+#: driver.c:682
#, c-format
msgid " (%d body octets)"
msgstr " (%d body octets)"
-#: driver.c:770
+#: driver.c:743
#, c-format
-msgid ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-msgstr ""
-"message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
+msgstr "message %s@%s:%d was not the expected length (%d actual != %d expected)\n"
-#: driver.c:802
+#: driver.c:774
msgid " retained\n"
msgstr " retained\n"
-#: driver.c:812
+#: driver.c:784
msgid " flushed\n"
msgstr " flushed\n"
-#: driver.c:824
+#: driver.c:801
msgid " not flushed\n"
msgstr " not flushed\n"
-#: driver.c:842
+#: driver.c:819
#, c-format
msgid "fetchlimit %d reached; %d message left on server %s account %s\n"
-msgid_plural ""
-"fetchlimit %d reached; %d messages left on server %s account %s\n"
+msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n"
msgstr[0] "fetchlimit %d reached; %d message left on server %s account %s\n"
msgstr[1] "fetchlimit %d reached; %d messages left on server %s account %s\n"
-#: driver.c:899
+#: driver.c:876
#, c-format
msgid "timeout after %d seconds waiting to connect to server %s.\n"
msgstr "timeout after %d seconds waiting to connect to server %s.\n"
-#: driver.c:903
+#: driver.c:880
#, c-format
msgid "timeout after %d seconds waiting for server %s.\n"
msgstr "timeout after %d seconds waiting for server %s.\n"
-#: driver.c:907
+#: driver.c:884
#, c-format
msgid "timeout after %d seconds waiting for %s.\n"
msgstr "timeout after %d seconds waiting for %s.\n"
-#: driver.c:912
+#: driver.c:889
#, c-format
msgid "timeout after %d seconds waiting for listener to respond.\n"
msgstr "timeout after %d seconds waiting for listener to respond.\n"
-#: driver.c:915
+#: driver.c:892
#, c-format
msgid "timeout after %d seconds.\n"
msgstr "timeout after %d seconds.\n"
-#: driver.c:927
-#, fuzzy
-msgid "fetchmail sees repeated timeouts"
+#: driver.c:904
+msgid "Subject: fetchmail sees repeated timeouts"
msgstr "Subject: fetchmail sees repeated timeouts"
-#: driver.c:930
+#: driver.c:907
#, c-format
-msgid ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
-msgstr ""
-"Fetchmail saw more than %d timeouts while attempting to get mail from %s@"
-"%s.\n"
+msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
+msgstr "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n"
-#: driver.c:934
+#: driver.c:911
msgid ""
"This could mean that your mailserver is stuck, or that your SMTP\n"
"server is wedged, or that your mailbox file on the server has been\n"
@@ -214,73 +200,73 @@ msgstr ""
"\n"
"Fetchmail won't poll this mailbox again until you restart it.\n"
-#: driver.c:960
-#, fuzzy, c-format
-msgid "pre-connection command terminated with signal %d\n"
-msgstr "pre-connection command failed with status %d\n"
-
-#: driver.c:963
+#: driver.c:936
#, c-format
msgid "pre-connection command failed with status %d\n"
msgstr "pre-connection command failed with status %d\n"
-#: driver.c:987
+#: driver.c:960
#, c-format
msgid "couldn't find HESIOD pobox for %s\n"
msgstr "couldn't find HESIOD pobox for %s\n"
-#: driver.c:1008
+#: driver.c:981
msgid "Lead server has no name.\n"
msgstr "Lead server has no name.\n"
-#: driver.c:1035
+#: driver.c:1005
#, c-format
msgid "couldn't find canonical DNS name of %s (%s): %s\n"
msgstr "couldn't find canonical DNS name of %s (%s): %s\n"
-#: driver.c:1082
+#: driver.c:1052
#, c-format
msgid "%s connection to %s failed"
msgstr "%s connection to %s failed"
-#: driver.c:1111
+#: driver.c:1068
+msgid "Subject: Fetchmail unreachable-server warning."
+msgstr "Subject: Fetchmail unreachable-server warning."
+
+#: driver.c:1070
+#, c-format
+msgid "Fetchmail could not reach the mail server %s:"
+msgstr "Fetchmail could not reach the mail server %s:"
+
+#: driver.c:1096 imap.c:423 pop3.c:465
msgid "SSL connection failed.\n"
msgstr "SSL connection failed.\n"
-#: driver.c:1166
+#: driver.c:1149
#, c-format
msgid "Lock-busy error on %s@%s\n"
msgstr "Lock-busy error on %s@%s\n"
-#: driver.c:1170
+#: driver.c:1153
#, c-format
msgid "Server busy error on %s@%s\n"
msgstr "Server busy error on %s@%s\n"
-#: driver.c:1175
+#: driver.c:1158
#, c-format
msgid "Authorization failure on %s@%s%s\n"
msgstr "Authorisation failure on %s@%s%s\n"
-#: driver.c:1178
+#: driver.c:1161
msgid " (previously authorized)"
msgstr " (previously authorised)"
-#: driver.c:1181
-msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
-msgstr ""
-
-#: driver.c:1202
-#, fuzzy, c-format
-msgid "fetchmail authentication failed on %s@%s"
+#: driver.c:1182
+#, c-format
+msgid "Subject: fetchmail authentication failed on %s@%s"
msgstr "Subject: fetchmail authentication failed on %s@%s"
-#: driver.c:1206
+#: driver.c:1186
#, c-format
msgid "Fetchmail could not get mail from %s@%s.\n"
msgstr "Fetchmail could not get mail from %s@%s.\n"
-#: driver.c:1210
+#: driver.c:1190
msgid ""
"The attempt to get authorization failed.\n"
"Since we have already succeeded in getting authorization for this\n"
@@ -294,7 +280,7 @@ msgstr ""
"that fetchmail cannot distinguish because the server didn't send a useful\n"
"error message."
-#: driver.c:1216
+#: driver.c:1196
msgid ""
"\n"
"However, if you HAVE changed your account details since starting the\n"
@@ -314,7 +300,7 @@ msgstr ""
"at each cycle. No future notifications will be sent until service\n"
"is restored."
-#: driver.c:1226
+#: driver.c:1206
msgid ""
"The attempt to get authorization failed.\n"
"This probably means your password is invalid, but some servers have\n"
@@ -334,182 +320,172 @@ msgstr ""
"at each cycle. No future notifications will be sent until service\n"
"is restored."
-#: driver.c:1242
+#: driver.c:1222
#, c-format
msgid "Repoll immediately on %s@%s\n"
msgstr "Repoll immediately on %s@%s\n"
-#: driver.c:1247
+#: driver.c:1227
#, c-format
msgid "Unknown login or authentication error on %s@%s\n"
msgstr "Unknown login or authentication error on %s@%s\n"
-#: driver.c:1271
+#: driver.c:1251
#, c-format
msgid "Authorization OK on %s@%s\n"
msgstr "Authorisation OK on %s@%s\n"
-#: driver.c:1277
-#, fuzzy, c-format
-msgid "fetchmail authentication OK on %s@%s"
+#: driver.c:1257
+#, c-format
+msgid "Subject: fetchmail authentication OK on %s@%s"
msgstr "Subject: fetchmail authentication OK on %s@%s"
-#: driver.c:1281
+#: driver.c:1261
#, c-format
msgid "Fetchmail was able to log into %s@%s.\n"
msgstr "Fetchmail was able to log into %s@%s.\n"
-#: driver.c:1285
+#: driver.c:1265
msgid "Service has been restored.\n"
msgstr "Service has been restored.\n"
-#: driver.c:1318
+#: driver.c:1297
#, c-format
msgid "selecting or re-polling folder %s\n"
msgstr "selecting or re-polling folder %s\n"
-#: driver.c:1320
+#: driver.c:1299
msgid "selecting or re-polling default folder\n"
msgstr "selecting or re-polling default folder\n"
-#: driver.c:1332
+#: driver.c:1311
#, c-format
msgid "%s at %s (folder %s)"
msgstr "%s at %s (folder %s)"
-#: driver.c:1335 rcfile_y.y:390
+#: driver.c:1314 rcfile_y.y:381
#, c-format
msgid "%s at %s"
msgstr "%s at %s"
-#: driver.c:1340
+#: driver.c:1319
#, c-format
msgid "Polling %s\n"
msgstr "Polling %s\n"
-#: driver.c:1344
+#: driver.c:1323
#, c-format
msgid "%d message (%d %s) for %s"
msgid_plural "%d messages (%d %s) for %s"
msgstr[0] "%d message (%d %s) for %s"
msgstr[1] "%d messages (%d %s) for %s"
-#: driver.c:1347
+#: driver.c:1326
msgid "seen"
msgid_plural "seen"
msgstr[0] "seen"
msgstr[1] "seen"
-#: driver.c:1350
+#: driver.c:1329
#, c-format
msgid "%d message for %s"
msgid_plural "%d messages for %s"
msgstr[0] "%d message for %s"
msgstr[1] "%d messages for %s"
-#: driver.c:1357
+#: driver.c:1336
#, c-format
msgid " (%d octets).\n"
msgstr " (%d octets).\n"
-#: driver.c:1363
+#: driver.c:1342
#, c-format
msgid "No mail for %s\n"
msgstr "No mail for %s\n"
-#: driver.c:1396
+#: driver.c:1375 imap.c:89
msgid "bogus message count!"
msgstr "bogus message count!"
-#: driver.c:1448
-#, c-format
-msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n"
-msgstr ""
-
-#: driver.c:1549
+#: driver.c:1517
msgid "socket"
msgstr "socket"
-#: driver.c:1552
+#: driver.c:1520
msgid "missing or bad RFC822 header"
msgstr "missing or bad RFC822 header"
-#: driver.c:1555
+#: driver.c:1523
msgid "MDA"
msgstr "MDA"
-#: driver.c:1558
+#: driver.c:1526
msgid "client/server synchronization"
msgstr "client/server synchronisation"
-#: driver.c:1561
+#: driver.c:1529
msgid "client/server protocol"
msgstr "client/server protocol"
-#: driver.c:1564
+#: driver.c:1532
msgid "lock busy on server"
msgstr "lock busy on server"
-#: driver.c:1567
+#: driver.c:1535
msgid "SMTP transaction"
msgstr "SMTP transaction"
-#: driver.c:1570
+#: driver.c:1538
msgid "DNS lookup"
msgstr "DNS lookup"
-#: driver.c:1573
+#: driver.c:1541
msgid "undefined"
msgstr "undefined"
-#: driver.c:1579
+#: driver.c:1547
#, c-format
msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
msgstr "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
-#: driver.c:1581
+#: driver.c:1549
msgid "unknown"
msgstr "unknown"
-#: driver.c:1583
+#: driver.c:1551
#, c-format
msgid "%s error while fetching from %s@%s\n"
msgstr "%s error while fetching from %s@%s\n"
-#: driver.c:1595
-#, fuzzy, c-format
-msgid "post-connection command terminated with signal %d\n"
-msgstr "post-connection command failed with status %d\n"
-
-#: driver.c:1597
+#: driver.c:1562
#, c-format
msgid "post-connection command failed with status %d\n"
msgstr "post-connection command failed with status %d\n"
-#: driver.c:1616
+#: driver.c:1581
msgid "Kerberos V4 support not linked.\n"
msgstr "Kerberos V4 support not linked.\n"
-#: driver.c:1624
+#: driver.c:1589
msgid "Kerberos V5 support not linked.\n"
msgstr "Kerberos V5 support not linked.\n"
-#: driver.c:1635
+#: driver.c:1600
#, c-format
msgid "Option --flush is not supported with %s\n"
msgstr "Option --flush is not supported with %s\n"
-#: driver.c:1641
+#: driver.c:1606
#, c-format
msgid "Option --all is not supported with %s\n"
msgstr "Option --all is not supported with %s\n"
-#: driver.c:1650
+#: driver.c:1615
#, c-format
msgid "Option --limit is not supported with %s\n"
msgstr "Option --limit is not supported with %s\n"
-#: env.c:58
+#: env.c:59
#, c-format
msgid ""
"%s: The QMAILINJECT environment variable is set.\n"
@@ -524,63 +500,51 @@ msgstr ""
"Try \"env QMAILINJECT= %s YOUR ARGUMENTS HERE\"\n"
"%s: Abort.\n"
-#: env.c:70
+#: env.c:71
#, c-format
msgid ""
"%s: The NULLMAILER_FLAGS environment variable is set.\n"
"This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
-"headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
"Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
"%s: Abort.\n"
msgstr ""
"%s: The NULLMAILER_FLAGS environment variable is set.\n"
"This is dangerous as it can make nullmailer-inject or nullmailer's\n"
-"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: "
-"headers.\n"
+"sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
"Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
"%s: Abort.\n"
-#: env.c:82
+#: env.c:83
#, c-format
msgid "%s: You don't exist. Go away.\n"
msgstr "%s: You don't exist. Go away.\n"
-#: env.c:143
-msgid "Cannot find absolute path for user's home directory.\n"
-msgstr ""
-
-#: env.c:167
-msgid "Cannot find absolute path for fetchmail's home directory.\n"
-msgstr ""
-
-#: env.c:200
+#: env.c:145
#, c-format
msgid "%s: can't determine your host!"
msgstr "%s: can't determine your host!"
-#: env.c:223
-#, fuzzy, c-format
-msgid "getaddrinfo failed for %s\n"
+#: env.c:168
+#, c-format
+msgid "gethostbyname failed for %s\n"
msgstr "gethostbyname failed for %s\n"
-#: env.c:225
+#: env.c:170
msgid "Cannot find my own host in hosts database to qualify it!\n"
msgstr "Cannot find my own host in hosts database to qualify it!\n"
-#: env.c:229
+#: env.c:174
msgid ""
"Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
-"problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
msgstr ""
"Trying to continue with unqualified hostname.\n"
-"DO NOT report broken Received: headers, HELO/EHLO lines or similar "
-"problems!\n"
+"DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n"
"DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"
-#: etrn.c:49 odmr.c:61
+#: etrn.c:49 odmr.c:60
#, c-format
msgid "%s's SMTP listener does not support ESMTP\n"
msgstr "%s's SMTP listener does not support ESMTP\n"
@@ -644,21 +608,17 @@ msgstr "Option --folder is not supported with ETRN\n"
msgid "Option --check is not supported with ETRN\n"
msgstr "Option --check is not supported with ETRN\n"
-#: fetchmail.c:142
-#, fuzzy, c-format
+#: fetchmail.c:132
msgid ""
"Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
-" Robert M. Funk, Graham Wilson\n"
-"Copyright (C) 2005 - 2012 Sunil Shetye\n"
-"Copyright (C) 2005 - %d Matthias Andree\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
+"Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
msgstr ""
"Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
-"Wilson\n"
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham Wilson\n"
"Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
-#: fetchmail.c:148
+#: fetchmail.c:136
msgid ""
"Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
"are welcome to redistribute it under certain conditions. For details,\n"
@@ -668,1010 +628,873 @@ msgstr ""
"are welcome to redistribute it under certain conditions. For details,\n"
"please see the file COPYING in the source or documentation directory.\n"
-#: fetchmail.c:188
+#: fetchmail.c:170
msgid "WARNING: Running as root is discouraged.\n"
msgstr "WARNING: Running as root is discouraged.\n"
-#: fetchmail.c:200
+#: fetchmail.c:182
msgid "fetchmail: invoked with"
msgstr "fetchmail: invoked with"
-#: fetchmail.c:223
+#: fetchmail.c:206
msgid "could not get current working directory\n"
msgstr "could not get current working directory\n"
-#: fetchmail.c:304
+#: fetchmail.c:268
#, c-format
msgid "This is fetchmail release %s"
msgstr "This is fetchmail release %s"
-#: fetchmail.c:308
-msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n"
-msgstr ""
-
-#: fetchmail.c:311
-msgid ""
-"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n"
-msgstr ""
-
-#: fetchmail.c:314
-msgid "WARNING: Compiled without SSL/TLS.\n"
-msgstr ""
-
-#: fetchmail.c:340
-msgid "The nodetach option is in effect, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:347
-msgid "Not running in daemon mode, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:354
-#, c-format
-msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
-msgstr ""
-
-#: fetchmail.c:360
-#, c-format
-msgid "Logfile \"%s\" is not writable, aborting.\n"
-msgstr ""
-
-#: fetchmail.c:378
-#, c-format
-msgid ""
-"syslog and logfile options are both set, ignoring syslog, and logging to %s"
-msgstr ""
-
-#: fetchmail.c:469
+#: fetchmail.c:383
#, c-format
msgid "Taking options from command line%s%s\n"
msgstr "Taking options from command line%s%s\n"
-#: fetchmail.c:470
+#: fetchmail.c:384
msgid " and "
msgstr " and "
-#: fetchmail.c:475
+#: fetchmail.c:389
#, c-format
msgid "No mailservers set up -- perhaps %s is missing?\n"
msgstr "No mailservers set up -- perhaps %s is missing?\n"
-#: fetchmail.c:496
+#: fetchmail.c:410
msgid "fetchmail: no mailservers have been specified.\n"
msgstr "fetchmail: no mailservers have been specified.\n"
-#: fetchmail.c:508
+#: fetchmail.c:422
msgid "fetchmail: no other fetchmail is running\n"
msgstr "fetchmail: no other fetchmail is running\n"
-#: fetchmail.c:514
-#, fuzzy, c-format
-msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
+#: fetchmail.c:428
+#, c-format
+msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
msgstr "fetchmail: error killing %s fetchmail at %d; bailing out.\n"
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:429 fetchmail.c:438
msgid "background"
msgstr "background"
-#: fetchmail.c:515 fetchmail.c:524
+#: fetchmail.c:429 fetchmail.c:438
msgid "foreground"
msgstr "foreground"
-#: fetchmail.c:523
-#, fuzzy, c-format
-msgid "fetchmail: %s fetchmail at %ld killed.\n"
+#: fetchmail.c:437
+#, c-format
+msgid "fetchmail: %s fetchmail at %d killed.\n"
msgstr "fetchmail: %s fetchmail at %d killed.\n"
-#: fetchmail.c:546
-msgid ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
-msgstr ""
-"fetchmail: can't check mail while another fetchmail to same host is "
-"running.\n"
+#: fetchmail.c:460
+msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n"
+msgstr "fetchmail: can't check mail while another fetchmail to same host is running.\n"
-#: fetchmail.c:552
-#, fuzzy, c-format
-msgid ""
-"fetchmail: can't poll specified hosts with another fetchmail running at "
-"%ld.\n"
-msgstr ""
-"fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+#: fetchmail.c:466
+#, c-format
+msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
+msgstr "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"
-#: fetchmail.c:559
-#, fuzzy, c-format
-msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
+#: fetchmail.c:473
+#, c-format
+msgid "fetchmail: another foreground fetchmail is running at %d.\n"
msgstr "fetchmail: another foreground fetchmail is running at %d.\n"
-#: fetchmail.c:569
-msgid ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
-msgstr ""
-"fetchmail: can't accept options while a background fetchmail is running.\n"
+#: fetchmail.c:483
+msgid "fetchmail: can't accept options while a background fetchmail is running.\n"
+msgstr "fetchmail: can't accept options while a background fetchmail is running.\n"
-#: fetchmail.c:581
-#, fuzzy, c-format
-msgid "fetchmail: background fetchmail at %ld awakened.\n"
+#: fetchmail.c:489
+#, c-format
+msgid "fetchmail: background fetchmail at %d awakened.\n"
msgstr "fetchmail: background fetchmail at %d awakened.\n"
-#: fetchmail.c:593
-#, fuzzy, c-format
-msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
+#: fetchmail.c:501
+#, c-format
+msgid "fetchmail: elder sibling at %d died mysteriously.\n"
msgstr "fetchmail: elder sibling at %d died mysteriously.\n"
-#: fetchmail.c:608
+#: fetchmail.c:516
#, c-format
msgid "fetchmail: can't find a password for %s@%s.\n"
msgstr "fetchmail: can't find a password for %s@%s.\n"
-#: fetchmail.c:612
+#: fetchmail.c:520
#, c-format
msgid "Enter password for %s@%s: "
msgstr "Enter password for %s@%s: "
-#: fetchmail.c:654
+#: fetchmail.c:545 fetchmail.c:581
+msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+msgstr "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
+
+#: fetchmail.c:557
msgid "fetchmail: Cannot detach into background. Aborting.\n"
msgstr "fetchmail: Cannot detach into background. Aborting.\n"
-#: fetchmail.c:658
-#, fuzzy, c-format
-msgid "starting fetchmail %s daemon\n"
+#: fetchmail.c:561
+#, c-format
+msgid "starting fetchmail %s daemon \n"
msgstr "starting fetchmail %s daemon \n"
-#: fetchmail.c:674 fetchmail.c:676
-#, fuzzy, c-format
-msgid "could not open %s to append logs to\n"
+#: fetchmail.c:577 fetchmail.c:579
+#, c-format
+msgid "could not open %s to append logs to \n"
msgstr "could not open %s to append logs to \n"
-#: fetchmail.c:695
-msgid "--check mode enabled, not fetching mail\n"
-msgstr ""
-
-#: fetchmail.c:717
+#: fetchmail.c:618
#, c-format
msgid "couldn't time-check %s (error %d)\n"
msgstr "couldn't time-check %s (error %d)\n"
-#: fetchmail.c:722
+#: fetchmail.c:623
#, c-format
msgid "restarting fetchmail (%s changed)\n"
msgstr "restarting fetchmail (%s changed)\n"
-#: fetchmail.c:726
+#: fetchmail.c:628
msgid "attempt to re-exec may fail as directory has not been restored\n"
msgstr "attempt to re-exec may fail as directory has not been restored\n"
-#: fetchmail.c:752
+#: fetchmail.c:655
msgid "attempt to re-exec fetchmail failed\n"
msgstr "attempt to re-exec fetchmail failed\n"
-#: fetchmail.c:782
+#: fetchmail.c:683
#, c-format
msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
msgstr "poll of %s skipped (failed authentication or too many timeouts)\n"
-#: fetchmail.c:794
+#: fetchmail.c:695
#, c-format
msgid "interval not reached, not querying %s\n"
msgstr "interval not reached, not querying %s\n"
-#: fetchmail.c:832
+#: fetchmail.c:733
msgid "Query status=0 (SUCCESS)\n"
msgstr "Query status=0 (SUCCESS)\n"
-#: fetchmail.c:834
+#: fetchmail.c:735
msgid "Query status=1 (NOMAIL)\n"
msgstr "Query status=1 (NOMAIL)\n"
-#: fetchmail.c:836
+#: fetchmail.c:737
msgid "Query status=2 (SOCKET)\n"
msgstr "Query status=2 (SOCKET)\n"
-#: fetchmail.c:838
+#: fetchmail.c:739
msgid "Query status=3 (AUTHFAIL)\n"
msgstr "Query status=3 (AUTHFAIL)\n"
-#: fetchmail.c:840
+#: fetchmail.c:741
msgid "Query status=4 (PROTOCOL)\n"
msgstr "Query status=4 (PROTOCOL)\n"
-#: fetchmail.c:842
+#: fetchmail.c:743
msgid "Query status=5 (SYNTAX)\n"
msgstr "Query status=5 (SYNTAX)\n"
-#: fetchmail.c:844
+#: fetchmail.c:745
msgid "Query status=6 (IOERR)\n"
msgstr "Query status=6 (IOERR)\n"
-#: fetchmail.c:846
+#: fetchmail.c:747
msgid "Query status=7 (ERROR)\n"
msgstr "Query status=7 (ERROR)\n"
-#: fetchmail.c:848
+#: fetchmail.c:749
msgid "Query status=8 (EXCLUDE)\n"
msgstr "Query status=8 (EXCLUDE)\n"
-#: fetchmail.c:850
+#: fetchmail.c:751
msgid "Query status=9 (LOCKBUSY)\n"
msgstr "Query status=9 (LOCKBUSY)\n"
-#: fetchmail.c:852
+#: fetchmail.c:753
msgid "Query status=10 (SMTP)\n"
msgstr "Query status=10 (SMTP)\n"
-#: fetchmail.c:854
+#: fetchmail.c:755
msgid "Query status=11 (DNS)\n"
msgstr "Query status=11 (DNS)\n"
-#: fetchmail.c:856
+#: fetchmail.c:757
msgid "Query status=12 (BSMTP)\n"
msgstr "Query status=12 (BSMTP)\n"
-#: fetchmail.c:858
+#: fetchmail.c:759
msgid "Query status=13 (MAXFETCH)\n"
msgstr "Query status=13 (MAXFETCH)\n"
-#: fetchmail.c:860
+#: fetchmail.c:761
#, c-format
msgid "Query status=%d\n"
msgstr "Query status=%d\n"
-#: fetchmail.c:902
+#: fetchmail.c:807
msgid "All connections are wedged. Exiting.\n"
msgstr "All connections are wedged. Exiting.\n"
-#: fetchmail.c:910
+#: fetchmail.c:814
#, c-format
msgid "sleeping at %s for %d seconds\n"
msgstr "sleeping at %s for %d seconds\n"
-#: fetchmail.c:934
+#: fetchmail.c:838
#, c-format
msgid "awakened by %s\n"
msgstr "awakened by %s\n"
-#: fetchmail.c:937
+#: fetchmail.c:841
#, c-format
msgid "awakened by signal %d\n"
msgstr "awakened by signal %d\n"
-#: fetchmail.c:945
+#: fetchmail.c:848
#, c-format
msgid "awakened at %s\n"
msgstr "awakened at %s\n"
-#: fetchmail.c:950
+#: fetchmail.c:854
#, c-format
msgid "normal termination, status %d\n"
msgstr "normal termination, status %d\n"
-#: fetchmail.c:1114
+#: fetchmail.c:1006
msgid "couldn't time-check the run-control file\n"
msgstr "couldn't time-check the run-control file\n"
-#: fetchmail.c:1148
+#: fetchmail.c:1039
#, c-format
msgid "Warning: multiple mentions of host %s in config file\n"
msgstr "Warning: multiple mentions of host %s in config file\n"
-#: fetchmail.c:1187
-#, fuzzy
-msgid ""
-"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults"
-"\" is not the first record.\n"
+#: fetchmail.c:1072
+msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
msgstr "fetchmail: Error: multiple \"defaults\" records in config file.\n"
-#: fetchmail.c:1317
+#: fetchmail.c:1194
msgid "SSL support is not compiled in.\n"
msgstr "SSL support is not compiled in.\n"
-#: fetchmail.c:1324
-#, fuzzy
-msgid "KERBEROS v4 support is configured, but not compiled in.\n"
-msgstr "SSL support is not compiled in.\n"
-
-#: fetchmail.c:1330
-#, fuzzy
-msgid "KERBEROS v5 support is configured, but not compiled in.\n"
-msgstr "SSL support is not compiled in.\n"
-
-#: fetchmail.c:1336
-#, fuzzy
-msgid "GSSAPI support is configured, but not compiled in.\n"
-msgstr "SSL support is not compiled in.\n"
-
-#: fetchmail.c:1366
+#: fetchmail.c:1225
#, c-format
-msgid ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-msgstr ""
-"fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
+msgstr "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
-#: fetchmail.c:1377
+#: fetchmail.c:1236
#, c-format
msgid "warning: multidrop for %s requires envelope option!\n"
msgstr "warning: multidrop for %s requires envelope option!\n"
-#: fetchmail.c:1378
+#: fetchmail.c:1237
msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
msgstr "warning: Do not ask for support if all mail goes to postmaster!\n"
-#: fetchmail.c:1395
+#: fetchmail.c:1254
#, c-format
-msgid ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
-msgstr ""
-"fetchmail: %s configuration invalid, specify positive port number for "
-"service or port\n"
+msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
+msgstr "fetchmail: %s configuration invalid, specify positive port number for service or port\n"
-#: fetchmail.c:1402
+#: fetchmail.c:1261
#, c-format
msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
msgstr "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
-#: fetchmail.c:1420
+#: fetchmail.c:1279
#, c-format
msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
msgstr "%s configuration invalid, LMTP can't use default SMTP port\n"
-#: fetchmail.c:1434
+#: fetchmail.c:1293
msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
msgstr "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-#: fetchmail.c:1444
-msgid ""
-"fetchmail: Error: idle mode does not work for multiple folders or accounts!\n"
-msgstr ""
-
-#: fetchmail.c:1468
+#: fetchmail.c:1318
#, c-format
msgid "terminated with signal %d\n"
msgstr "terminated with signal %d\n"
-#: fetchmail.c:1541
+#: fetchmail.c:1391
#, c-format
msgid "%s querying %s (protocol %s) at %s: poll started\n"
msgstr "%s querying %s (protocol %s) at %s: poll started\n"
-#: fetchmail.c:1566
+#: fetchmail.c:1416
msgid "POP2 support is not configured.\n"
msgstr "POP2 support is not configured.\n"
-#: fetchmail.c:1578
+#: fetchmail.c:1428
msgid "POP3 support is not configured.\n"
msgstr "POP3 support is not configured.\n"
-#: fetchmail.c:1588
+#: fetchmail.c:1438
msgid "IMAP support is not configured.\n"
msgstr "IMAP support is not configured.\n"
-#: fetchmail.c:1594
+#: fetchmail.c:1444
msgid "ETRN support is not configured.\n"
msgstr "ETRN support is not configured.\n"
-#: fetchmail.c:1602
+#: fetchmail.c:1452
msgid "ODMR support is not configured.\n"
msgstr "ODMR support is not configured.\n"
-#: fetchmail.c:1609
+#: fetchmail.c:1459
msgid "unsupported protocol selected.\n"
msgstr "unsupported protocol selected.\n"
-#: fetchmail.c:1620
+#: fetchmail.c:1469
#, c-format
msgid "%s querying %s (protocol %s) at %s: poll completed\n"
msgstr "%s querying %s (protocol %s) at %s: poll completed\n"
-#: fetchmail.c:1645
+#: fetchmail.c:1486
#, c-format
msgid "Poll interval is %d seconds\n"
msgstr "Poll interval is %d seconds\n"
-#: fetchmail.c:1647
+#: fetchmail.c:1488
#, c-format
msgid "Logfile is %s\n"
msgstr "Logfile is %s\n"
-#: fetchmail.c:1649
+#: fetchmail.c:1490
#, c-format
msgid "Idfile is %s\n"
msgstr "Idfile is %s\n"
-#: fetchmail.c:1652
+#: fetchmail.c:1493
msgid "Progress messages will be logged via syslog\n"
msgstr "Progress messages will be logged via syslog\n"
-#: fetchmail.c:1655
+#: fetchmail.c:1496
msgid "Fetchmail will masquerade and will not generate Received\n"
msgstr "Fetchmail will masquerade and will not generate Received\n"
-#: fetchmail.c:1657
+#: fetchmail.c:1498
msgid "Fetchmail will show progress dots even in logfiles.\n"
msgstr "Fetchmail will show progress dots even in logfiles.\n"
-#: fetchmail.c:1659
+#: fetchmail.c:1500
#, c-format
msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-#: fetchmail.c:1663
+#: fetchmail.c:1504
msgid "Fetchmail will direct error mail to the postmaster.\n"
msgstr "Fetchmail will direct error mail to the postmaster.\n"
-#: fetchmail.c:1665
+#: fetchmail.c:1506
msgid "Fetchmail will direct error mail to the sender.\n"
msgstr "Fetchmail will direct error mail to the sender.\n"
-#: fetchmail.c:1668
-#, fuzzy
-msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
-msgstr "Fetchmail will forward misaddressed multidrop messages to %s.\n"
-
-#: fetchmail.c:1670
-#, fuzzy
-msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
-msgstr "Fetchmail will direct error mail to the sender.\n"
-
-#: fetchmail.c:1677
+#: fetchmail.c:1513
#, c-format
msgid "Options for retrieving from %s@%s:\n"
msgstr "Options for retrieving from %s@%s:\n"
-#: fetchmail.c:1681
+#: fetchmail.c:1517
#, c-format
msgid " Mail will be retrieved via %s\n"
msgstr " Mail will be retrieved via %s\n"
-#: fetchmail.c:1684
+#: fetchmail.c:1520
#, 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] " Poll of this server will occur every %d interval.\n"
msgstr[1] " Poll of this server will occur every %d intervals.\n"
-#: fetchmail.c:1688
+#: fetchmail.c:1524
#, c-format
msgid " True name of server is %s.\n"
msgstr " True name of server is %s.\n"
-#: fetchmail.c:1691
+#: fetchmail.c:1527
msgid " This host will not be queried when no host is specified.\n"
msgstr " This host will not be queried when no host is specified.\n"
-#: fetchmail.c:1692
+#: fetchmail.c:1528
msgid " This host will be queried when no host is specified.\n"
msgstr " This host will be queried when no host is specified.\n"
-#: fetchmail.c:1696
+#: fetchmail.c:1532
msgid " Password will be prompted for.\n"
msgstr " Password will be prompted for.\n"
-#: fetchmail.c:1700
+#: fetchmail.c:1536
#, c-format
msgid " APOP secret = \"%s\".\n"
msgstr " APOP secret = \"%s\".\n"
-#: fetchmail.c:1703
+#: fetchmail.c:1539
#, c-format
msgid " RPOP id = \"%s\".\n"
msgstr " RPOP id = \"%s\".\n"
-#: fetchmail.c:1706
+#: fetchmail.c:1542
#, c-format
msgid " Password = \"%s\".\n"
msgstr " Password = \"%s\".\n"
-#: fetchmail.c:1715
+#: fetchmail.c:1551
#, c-format
msgid " Protocol is KPOP with Kerberos %s authentication"
msgstr " Protocol is KPOP with Kerberos %s authentication"
-#: fetchmail.c:1718
+#: fetchmail.c:1554
#, c-format
msgid " Protocol is %s"
msgstr " Protocol is %s"
-#: fetchmail.c:1720
+#: fetchmail.c:1556
#, c-format
msgid " (using service %s)"
msgstr " (using service %s)"
-#: fetchmail.c:1722
+#: fetchmail.c:1558
msgid " (using default port)"
msgstr " (using default port)"
-#: fetchmail.c:1724
+#: fetchmail.c:1560
msgid " (forcing UIDL use)"
msgstr " (forcing UIDL use)"
-#: fetchmail.c:1730
+#: fetchmail.c:1566
msgid " All available authentication methods will be tried.\n"
msgstr " All available authentication methods will be tried.\n"
-#: fetchmail.c:1733
+#: fetchmail.c:1569
msgid " Password authentication will be forced.\n"
msgstr " Password authentication will be forced.\n"
-#: fetchmail.c:1736
+#: fetchmail.c:1572
msgid " MSN authentication will be forced.\n"
msgstr " MSN authentication will be forced.\n"
-#: fetchmail.c:1739
+#: fetchmail.c:1575
msgid " NTLM authentication will be forced.\n"
msgstr " NTLM authentication will be forced.\n"
-#: fetchmail.c:1742
+#: fetchmail.c:1578
msgid " OTP authentication will be forced.\n"
msgstr " OTP authentication will be forced.\n"
-#: fetchmail.c:1745
-#, fuzzy
-msgid " CRAM-MD5 authentication will be forced.\n"
+#: fetchmail.c:1581
+msgid " CRAM-Md5 authentication will be forced.\n"
msgstr " CRAM-Md5 authentication will be forced.\n"
-#: fetchmail.c:1748
+#: fetchmail.c:1584
msgid " GSSAPI authentication will be forced.\n"
msgstr " GSSAPI authentication will be forced.\n"
-#: fetchmail.c:1751
+#: fetchmail.c:1587
msgid " Kerberos V4 authentication will be forced.\n"
msgstr " Kerberos V4 authentication will be forced.\n"
-#: fetchmail.c:1754
+#: fetchmail.c:1590
msgid " Kerberos V5 authentication will be forced.\n"
msgstr " Kerberos V5 authentication will be forced.\n"
-#: fetchmail.c:1757
+#: fetchmail.c:1593
msgid " End-to-end encryption assumed.\n"
msgstr " End-to-end encryption assumed.\n"
-#: fetchmail.c:1761
+#: fetchmail.c:1597
#, c-format
msgid " Mail service principal is: %s\n"
msgstr " Mail service principal is: %s\n"
-#: fetchmail.c:1764
+#: fetchmail.c:1600
msgid " SSL encrypted sessions enabled.\n"
msgstr " SSL encrypted sessions enabled.\n"
-#: fetchmail.c:1766
+#: fetchmail.c:1602
#, c-format
msgid " SSL protocol: %s.\n"
msgstr " SSL protocol: %s.\n"
-#: fetchmail.c:1768
+#: fetchmail.c:1604
msgid " SSL server certificate checking enabled.\n"
msgstr " SSL server certificate checking enabled.\n"
-#: fetchmail.c:1770
-#, fuzzy
-msgid " SSL server certificate checking disabled.\n"
-msgstr " SSL server certificate checking enabled.\n"
-
-#: fetchmail.c:1773
-#, fuzzy, c-format
-msgid " SSL trusted certificate file: %s\n"
-msgstr " SSL trusted certificate directory: %s\n"
-
-#: fetchmail.c:1775
+#: fetchmail.c:1606
#, c-format
msgid " SSL trusted certificate directory: %s\n"
msgstr " SSL trusted certificate directory: %s\n"
-#: fetchmail.c:1777
-#, fuzzy, c-format
-msgid " SSL server CommonName: %s\n"
-msgstr "Server CommonName: %s\n"
-
-#: fetchmail.c:1779
+#: fetchmail.c:1609
#, c-format
msgid " SSL key fingerprint (checked against the server key): %s\n"
msgstr " SSL key fingerprint (checked against the server key): %s\n"
-#: fetchmail.c:1782
+#: fetchmail.c:1612
#, c-format
msgid " Server nonresponse timeout is %d seconds"
msgstr " Server nonresponse timeout is %d seconds"
-#: fetchmail.c:1784
+#: fetchmail.c:1614
msgid " (default).\n"
msgstr " (default).\n"
-#: fetchmail.c:1791
+#: fetchmail.c:1621
msgid " Default mailbox selected.\n"
msgstr " Default mailbox selected.\n"
-#: fetchmail.c:1796
+#: fetchmail.c:1626
msgid " Selected mailboxes are:"
msgstr " Selected mailboxes are:"
-#: fetchmail.c:1802
+#: fetchmail.c:1632
msgid " All messages will be retrieved (--all on).\n"
msgstr " All messages will be retrieved (--all on).\n"
-#: fetchmail.c:1803
+#: fetchmail.c:1633
msgid " Only new messages will be retrieved (--all off).\n"
msgstr " Only new messages will be retrieved (--all off).\n"
-#: fetchmail.c:1805
+#: fetchmail.c:1635
msgid " Fetched messages will be kept on the server (--keep on).\n"
msgstr " Fetched messages will be kept on the server (--keep on).\n"
-#: fetchmail.c:1806
+#: fetchmail.c:1636
msgid " Fetched messages will not be kept on the server (--keep off).\n"
msgstr " Fetched messages will not be kept on the server (--keep off).\n"
-#: fetchmail.c:1808
+#: fetchmail.c:1638
msgid " Old messages will be flushed before message retrieval (--flush on).\n"
-msgstr ""
-" Old messages will be flushed before message retrieval (--flush on).\n"
+msgstr " Old messages will be flushed before message retrieval (--flush on).\n"
-#: fetchmail.c:1809
-msgid ""
-" Old messages will not be flushed before message retrieval (--flush off).\n"
-msgstr ""
-" Old messages will not be flushed before message retrieval (--flush off).\n"
+#: fetchmail.c:1639
+msgid " Old messages will not be flushed before message retrieval (--flush off).\n"
+msgstr " Old messages will not be flushed before message retrieval (--flush off).\n"
-#: fetchmail.c:1811
-msgid ""
-" Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
-msgstr ""
-" Oversized messages will be flushed before message retrieval (--limitflush "
-"on).\n"
+#: fetchmail.c:1641
+msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n"
+msgstr " Oversized messages will be flushed before message retrieval (--limitflush on).\n"
-#: fetchmail.c:1812
-msgid ""
-" Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
-msgstr ""
-" Oversized messages will not be flushed before message retrieval (--"
-"limitflush off).\n"
+#: fetchmail.c:1642
+msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
+msgstr " Oversized messages will not be flushed before message retrieval (--limitflush off).\n"
-#: fetchmail.c:1814
+#: fetchmail.c:1644
msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n"
msgstr " Rewrite of server-local addresses is enabled (--norewrite off).\n"
-#: fetchmail.c:1815
+#: fetchmail.c:1645
msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n"
msgstr " Rewrite of server-local addresses is disabled (--norewrite on).\n"
-#: fetchmail.c:1817
+#: fetchmail.c:1647
msgid " Carriage-return stripping is enabled (stripcr on).\n"
msgstr " Carriage-return stripping is enabled (stripcr on).\n"
-#: fetchmail.c:1818
+#: fetchmail.c:1648
msgid " Carriage-return stripping is disabled (stripcr off).\n"
msgstr " Carriage-return stripping is disabled (stripcr off).\n"
-#: fetchmail.c:1820
+#: fetchmail.c:1650
msgid " Carriage-return forcing is enabled (forcecr on).\n"
msgstr " Carriage-return forcing is enabled (forcecr on).\n"
-#: fetchmail.c:1821
+#: fetchmail.c:1651
msgid " Carriage-return forcing is disabled (forcecr off).\n"
msgstr " Carriage-return forcing is disabled (forcecr off).\n"
-#: fetchmail.c:1823
-msgid ""
-" Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-msgstr ""
-" Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+#: fetchmail.c:1653
+msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
+msgstr " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
-#: fetchmail.c:1824
-msgid ""
-" Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-msgstr ""
-" Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+#: fetchmail.c:1654
+msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
+msgstr " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
-#: fetchmail.c:1826
+#: fetchmail.c:1656
msgid " MIME decoding is enabled (mimedecode on).\n"
msgstr " MIME decoding is enabled (mimedecode on).\n"
-#: fetchmail.c:1827
+#: fetchmail.c:1657
msgid " MIME decoding is disabled (mimedecode off).\n"
msgstr " MIME decoding is disabled (mimedecode off).\n"
-#: fetchmail.c:1829
+#: fetchmail.c:1659
msgid " Idle after poll is enabled (idle on).\n"
msgstr " Idle after poll is enabled (idle on).\n"
-#: fetchmail.c:1830
+#: fetchmail.c:1660
msgid " Idle after poll is disabled (idle off).\n"
msgstr " Idle after poll is disabled (idle off).\n"
-#: fetchmail.c:1832
+#: fetchmail.c:1662
msgid " Nonempty Status lines will be discarded (dropstatus on)\n"
msgstr " Nonempty Status lines will be discarded (dropstatus on)\n"
-#: fetchmail.c:1833
+#: fetchmail.c:1663
msgid " Nonempty Status lines will be kept (dropstatus off)\n"
msgstr " Nonempty Status lines will be kept (dropstatus off)\n"
-#: fetchmail.c:1835
+#: fetchmail.c:1665
msgid " Delivered-To lines will be discarded (dropdelivered on)\n"
msgstr " Delivered-To lines will be discarded (dropdelivered on)\n"
-#: fetchmail.c:1836
+#: fetchmail.c:1666
msgid " Delivered-To lines will be kept (dropdelivered off)\n"
msgstr " Delivered-To lines will be kept (dropdelivered off)\n"
-#: fetchmail.c:1840
+#: fetchmail.c:1670
#, c-format
msgid " Message size limit is %d octets (--limit %d).\n"
msgstr " Message size limit is %d octets (--limit %d).\n"
-#: fetchmail.c:1843
+#: fetchmail.c:1673
msgid " No message size limit (--limit 0).\n"
msgstr " No message size limit (--limit 0).\n"
-#: fetchmail.c:1845
+#: fetchmail.c:1675
#, c-format
msgid " Message size warning interval is %d seconds (--warnings %d).\n"
msgstr " Message size warning interval is %d seconds (--warnings %d).\n"
-#: fetchmail.c:1848
+#: fetchmail.c:1678
msgid " Size warnings on every poll (--warnings 0).\n"
msgstr " Size warnings on every poll (--warnings 0).\n"
-#: fetchmail.c:1851
+#: fetchmail.c:1681
#, c-format
msgid " Received-message limit is %d (--fetchlimit %d).\n"
msgstr " Received-message limit is %d (--fetchlimit %d).\n"
-#: fetchmail.c:1854
+#: fetchmail.c:1684
msgid " No received-message limit (--fetchlimit 0).\n"
msgstr " No received-message limit (--fetchlimit 0).\n"
-#: fetchmail.c:1856
+#: fetchmail.c:1686
#, c-format
msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n"
msgstr " Fetch message size limit is %d (--fetchsizelimit %d).\n"
-#: fetchmail.c:1859
+#: fetchmail.c:1689
msgid " No fetch message size limit (--fetchsizelimit 0).\n"
msgstr " No fetch message size limit (--fetchsizelimit 0).\n"
-#: fetchmail.c:1863
+#: fetchmail.c:1693
msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n"
msgstr " Do binary search of UIDs during each poll (--fastuidl 1).\n"
-#: fetchmail.c:1865
+#: fetchmail.c:1695
#, c-format
msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-msgstr ""
-" Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
+msgstr " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
-#: fetchmail.c:1868
+#: fetchmail.c:1698
msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n"
msgstr " Do linear search of UIDs during each poll (--fastuidl 0).\n"
-#: fetchmail.c:1870
+#: fetchmail.c:1700
#, c-format
msgid " SMTP message batch limit is %d.\n"
msgstr " SMTP message batch limit is %d.\n"
-#: fetchmail.c:1872
+#: fetchmail.c:1702
msgid " No SMTP message batch limit (--batchlimit 0).\n"
msgstr " No SMTP message batch limit (--batchlimit 0).\n"
-#: fetchmail.c:1876
+#: fetchmail.c:1706
#, c-format
msgid " Deletion interval between expunges forced to %d (--expunge %d).\n"
msgstr " Deletion interval between expunges forced to %d (--expunge %d).\n"
-#: fetchmail.c:1878
+#: fetchmail.c:1708
msgid " No forced expunges (--expunge 0).\n"
msgstr " No forced expunges (--expunge 0).\n"
-#: fetchmail.c:1885
+#: fetchmail.c:1715
msgid " Domains for which mail will be fetched are:"
msgstr " Domains for which mail will be fetched are:"
-#: fetchmail.c:1890 fetchmail.c:1910
+#: fetchmail.c:1720 fetchmail.c:1740
msgid " (default)"
msgstr " (default)"
-#: fetchmail.c:1895
+#: fetchmail.c:1725
#, c-format
msgid " Messages will be appended to %s as BSMTP\n"
msgstr " Messages will be appended to %s as BSMTP\n"
-#: fetchmail.c:1897
+#: fetchmail.c:1727
#, c-format
msgid " Messages will be delivered with \"%s\".\n"
msgstr " Messages will be delivered with \"%s\".\n"
-#: fetchmail.c:1904
+#: fetchmail.c:1734
#, c-format
msgid " Messages will be %cMTP-forwarded to:"
msgstr " Messages will be %cMTP-forwarded to:"
-#: fetchmail.c:1915
+#: fetchmail.c:1745
#, c-format
msgid " Host part of MAIL FROM line will be %s\n"
msgstr " Host part of MAIL FROM line will be %s\n"
-#: fetchmail.c:1918
+#: fetchmail.c:1748
#, c-format
msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
msgstr " Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
-#: fetchmail.c:1927
+#: fetchmail.c:1757
msgid " Recognized listener spam block responses are:"
msgstr " Recognized listener spam block responses are:"
-#: fetchmail.c:1933
+#: fetchmail.c:1763
msgid " Spam-blocking disabled\n"
msgstr " Spam-blocking disabled\n"
-#: fetchmail.c:1936
+#: fetchmail.c:1766
#, c-format
msgid " Server connection will be brought up with \"%s\".\n"
msgstr " Server connection will be brought up with \"%s\".\n"
-#: fetchmail.c:1939
+#: fetchmail.c:1769
msgid " No pre-connection command.\n"
msgstr " No pre-connection command.\n"
-#: fetchmail.c:1941
+#: fetchmail.c:1771
#, c-format
msgid " Server connection will be taken down with \"%s\".\n"
msgstr " Server connection will be taken down with \"%s\".\n"
-#: fetchmail.c:1944
+#: fetchmail.c:1774
msgid " No post-connection command.\n"
msgstr " No post-connection command.\n"
-#: fetchmail.c:1947
+#: fetchmail.c:1777
msgid " No localnames declared for this host.\n"
msgstr " No localnames declared for this host.\n"
-#: fetchmail.c:1957
+#: fetchmail.c:1787
msgid " Multi-drop mode: "
msgstr " Multi-drop mode: "
-#: fetchmail.c:1959
+#: fetchmail.c:1789
msgid " Single-drop mode: "
msgstr " Single-drop mode: "
-#: fetchmail.c:1961
+#: fetchmail.c:1791
#, c-format
msgid "%d local name recognized.\n"
msgid_plural "%d local names recognized.\n"
msgstr[0] "%d local name recognized.\n"
msgstr[1] "%d local names recognized.\n"
-#: fetchmail.c:1976
+#: fetchmail.c:1806
msgid " DNS lookup for multidrop addresses is enabled.\n"
msgstr " DNS lookup for multidrop addresses is enabled.\n"
-#: fetchmail.c:1977
+#: fetchmail.c:1807
msgid " DNS lookup for multidrop addresses is disabled.\n"
msgstr " DNS lookup for multidrop addresses is disabled.\n"
-#: fetchmail.c:1981
-msgid ""
-" Server aliases will be compared with multidrop addresses by IP address.\n"
-msgstr ""
-" Server aliases will be compared with multidrop addresses by IP address.\n"
+#: fetchmail.c:1811
+msgid " Server aliases will be compared with multidrop addresses by IP address.\n"
+msgstr " Server aliases will be compared with multidrop addresses by IP address.\n"
-#: fetchmail.c:1983
+#: fetchmail.c:1813
msgid " Server aliases will be compared with multidrop addresses by name.\n"
msgstr " Server aliases will be compared with multidrop addresses by name.\n"
-#: fetchmail.c:1986
+#: fetchmail.c:1816
msgid " Envelope-address routing is disabled\n"
msgstr " Envelope-address routing is disabled\n"
-#: fetchmail.c:1989
+#: fetchmail.c:1819
#, c-format
msgid " Envelope header is assumed to be: %s\n"
msgstr " Envelope header is assumed to be: %s\n"
-#: fetchmail.c:1992
+#: fetchmail.c:1822
#, c-format
msgid " Number of envelope headers to be skipped over: %d\n"
msgstr " Number of envelope headers to be skipped over: %d\n"
-#: fetchmail.c:1995
+#: fetchmail.c:1825
#, c-format
msgid " Prefix %s will be removed from user id\n"
msgstr " Prefix %s will be removed from user id\n"
-#: fetchmail.c:1998
+#: fetchmail.c:1828
msgid " No prefix stripping\n"
msgstr " No prefix stripping\n"
-#: fetchmail.c:2003
+#: fetchmail.c:1835
msgid " Predeclared mailserver aliases:"
msgstr " Predeclared mailserver aliases:"
-#: fetchmail.c:2011
+#: fetchmail.c:1844
msgid " Local domains:"
msgstr " Local domains:"
-#: fetchmail.c:2021
+#: fetchmail.c:1854
#, c-format
msgid " Connection must be through interface %s.\n"
msgstr " Connection must be through interface %s.\n"
-#: fetchmail.c:2023
+#: fetchmail.c:1856
msgid " No interface requirement specified.\n"
msgstr " No interface requirement specified.\n"
-#: fetchmail.c:2025
+#: fetchmail.c:1858
#, c-format
msgid " Polling loop will monitor %s.\n"
msgstr " Polling loop will monitor %s.\n"
-#: fetchmail.c:2027
+#: fetchmail.c:1860
msgid " No monitor interface specified.\n"
msgstr " No monitor interface specified.\n"
-#: fetchmail.c:2031
+#: fetchmail.c:1864
#, c-format
msgid " Server connections will be made via plugin %s (--plugin %s).\n"
msgstr " Server connections will be made via plugin %s (--plugin %s).\n"
-#: fetchmail.c:2033
+#: fetchmail.c:1866
msgid " No plugin command specified.\n"
msgstr " No plugin command specified.\n"
-#: fetchmail.c:2035
+#: fetchmail.c:1868
#, c-format
msgid " Listener connections will be made via plugout %s (--plugout %s).\n"
msgstr " Listener connections will be made via plugout %s (--plugout %s).\n"
-#: fetchmail.c:2037
+#: fetchmail.c:1870
msgid " No plugout command specified.\n"
msgstr " No plugout command specified.\n"
-#: fetchmail.c:2044
+#: fetchmail.c:1875
msgid " No UIDs saved from this host.\n"
msgstr " No UIDs saved from this host.\n"
-#: fetchmail.c:2047
+#: fetchmail.c:1884
#, c-format
msgid " %d UIDs saved.\n"
msgstr " %d UIDs saved.\n"
-#: fetchmail.c:2053
+#: fetchmail.c:1892
msgid " Poll trace information will be added to the Received header.\n"
msgstr " Poll trace information will be added to the Received header.\n"
-#: fetchmail.c:2055
-#, fuzzy
-msgid " No poll trace information will be added to the Received header.\n"
-msgstr ""
+#: fetchmail.c:1894
+msgid ""
" No poll trace information will be added to the Received header.\n"
".\n"
-
-#: fetchmail.c:2060
-msgid " Messages with bad headers will be rejected.\n"
-msgstr ""
-
-#: fetchmail.c:2063
-msgid " Messages with bad headers will be passed on.\n"
msgstr ""
+" No poll trace information will be added to the Received header.\n"
+".\n"
-#: fetchmail.c:2068
+#: fetchmail.c:1897
#, c-format
msgid " Pass-through properties \"%s\".\n"
msgstr " Pass-through properties \"%s\".\n"
-#: fm_getaddrinfo.c:23 fm_getaddrinfo.c:30
-#, c-format
-msgid "Cannot modify signal mask: %s"
-msgstr ""
-
-#: fm_realpath.c:35
-msgid ""
-"Your operating system neither defines PATH_MAX nor will it accept "
-"realpath(f, NULL). Aborting.\n"
-msgstr ""
-
#: getpass.c:71
msgid "ERROR: no support for getpassword() routine\n"
msgstr "ERROR: no support for getpassword() routine\n"
@@ -1684,88 +1507,55 @@ msgstr ""
"\n"
"Caught SIGINT... bailing out.\n"
-#: gssapi.c:53
-#, c-format
-msgid "GSSAPI error in gss_display_status called from <%s>\n"
-msgstr ""
-
-#: gssapi.c:56
-#, fuzzy, c-format
-msgid "GSSAPI error %s: %.*s\n"
-msgstr "%cMTP error: %s\n"
-
-#: gssapi.c:91
+#: gssapi.c:66
#, c-format
msgid "Couldn't get service name for [%s]\n"
msgstr "Couldn't get service name for [%s]\n"
-#: gssapi.c:96
+#: gssapi.c:72
#, c-format
msgid "Using service name [%s]\n"
msgstr "Using service name [%s]\n"
-#: gssapi.c:123
-msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n"
-msgstr ""
-
-#: gssapi.c:124
-msgid ""
-"If you want to use GSSAPI, you need credentials first, possibly from kinit.\n"
-msgstr ""
-
-#: gssapi.c:160
-#, c-format
-msgid "Received malformed challenge to \"%s GSSAPI\"!\n"
-msgstr ""
-
-#: gssapi.c:170
+#: gssapi.c:89
msgid "Sending credentials\n"
msgstr "Sending credentials\n"
-#: gssapi.c:201
+#: gssapi.c:107
msgid "Error exchanging credentials\n"
msgstr "Error exchanging credentials\n"
-#: gssapi.c:243
+#: gssapi.c:152
msgid "Couldn't unwrap security level data\n"
msgstr "Couldn't unwrap security level data\n"
-#: gssapi.c:248
+#: gssapi.c:157
msgid "Credential exchange complete\n"
msgstr "Credential exchange complete\n"
-#: gssapi.c:252
+#: gssapi.c:161
msgid "Server requires integrity and/or privacy\n"
msgstr "Server requires integrity and/or privacy\n"
-#: gssapi.c:261
+#: gssapi.c:170
#, c-format
msgid "Unwrapped security level flags: %s%s%s\n"
msgstr "Unwrapped security level flags: %s%s%s\n"
-#: gssapi.c:265
+#: gssapi.c:174
#, c-format
msgid "Maximum GSS token size is %ld\n"
msgstr "Maximum GSS token size is %ld\n"
-#: gssapi.c:274
-msgid "GSSAPI username too long for static buffer.\n"
-msgstr ""
-
-#: gssapi.c:283
+#: gssapi.c:187
msgid "Error creating security level request\n"
msgstr "Error creating security level request\n"
-#: gssapi.c:287
-#, c-format
-msgid "GSSAPI send_token too large (%lu) while sending username.\n"
-msgstr ""
-
-#: gssapi.c:298
+#: gssapi.c:198
msgid "Releasing GSS credentials\n"
msgstr "Releasing GSS credentials\n"
-#: gssapi.c:302
+#: gssapi.c:201
msgid "Error releasing credentials\n"
msgstr "Error releasing credentials\n"
@@ -1774,132 +1564,94 @@ msgstr "Error releasing credentials\n"
msgid "fetchmail: thread sleeping for %d sec.\n"
msgstr "fetchmail: thread sleeping for %d sec.\n"
-#: imap.c:75
-#, c-format
-msgid "Received BYE response from IMAP server: %s\n"
-msgstr ""
-
-#: imap.c:97
-#, fuzzy, c-format
-msgid "bogus message count in \"%s\"!"
-msgstr "bogus message count!"
-
-#: imap.c:144
-#, c-format
-msgid "bogus EXPUNGE count in \"%s\"!"
-msgstr ""
-
-#: imap.c:355
+#: imap.c:316
msgid "Protocol identified as IMAP4 rev 1\n"
msgstr "Protocol identified as IMAP4 rev 1\n"
-#: imap.c:361
+#: imap.c:322
msgid "Protocol identified as IMAP4 rev 0\n"
msgstr "Protocol identified as IMAP4 rev 0\n"
-#: imap.c:368
+#: imap.c:329
msgid "Protocol identified as IMAP2 or IMAP2BIS\n"
msgstr "Protocol identified as IMAP2 or IMAP2BIS\n"
-#: imap.c:385
+#: imap.c:344
msgid "will idle after poll\n"
msgstr "will idle after poll\n"
-#: imap.c:476 pop3.c:474
-#, fuzzy, c-format
-msgid "%s: upgrade to TLS succeeded.\n"
-msgstr "%s: opportunistic upgrade to TLS.\n"
-
-#: imap.c:482 pop3.c:480
-#, fuzzy, c-format
-msgid "%s: upgrade to TLS failed.\n"
-msgstr "%s: opportunistic upgrade to TLS.\n"
-
-#: imap.c:487
-#, fuzzy, c-format
-msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n"
-msgstr "%s: opportunistic upgrade to TLS.\n"
-
-#: imap.c:502
+#: imap.c:427 pop3.c:469
#, c-format
-msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n"
-msgstr ""
+msgid "%s: opportunistic upgrade to TLS.\n"
+msgstr "%s: opportunistic upgrade to TLS.\n"
-#: imap.c:607
+#: imap.c:540
msgid "Required OTP capability not compiled into fetchmail\n"
msgstr "Required OTP capability not compiled into fetchmail\n"
-#: imap.c:627 pop3.c:560
+#: imap.c:562 pop3.c:372
msgid "Required NTLM capability not compiled into fetchmail\n"
msgstr "Required NTLM capability not compiled into fetchmail\n"
-#: imap.c:691
+#: imap.c:571
+msgid "Required LOGIN capability not supported by server\n"
+msgstr "Required LOGIN capability not supported by server\n"
+
+#: imap.c:645
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
msgstr "mail expunge mismatch (%d actual != %d expected)\n"
-#: imap.c:818
-#, c-format
-msgid "%lu is unseen\n"
-msgstr "%lu is unseen\n"
-
-#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095
-#, c-format
-msgid "%u is unseen\n"
-msgstr "%u is unseen\n"
-
-#: imap.c:903 imap.c:962
+#: imap.c:749 imap.c:808
msgid "re-poll failed\n"
msgstr "re-poll failed\n"
-#: imap.c:911 imap.c:967
+#: imap.c:757 imap.c:813
#, 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:928
+#: imap.c:774
msgid "mailbox selection failed\n"
msgstr "mailbox selection failed\n"
-#: imap.c:932
+#: imap.c:778
#, 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:946
+#: imap.c:792
msgid "expunge failed\n"
msgstr "expunge failed\n"
-#: imap.c:950
+#: imap.c:796
#, 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:989
+#: imap.c:838
msgid "search for unseen messages failed\n"
msgstr "search for unseen messages failed\n"
-#: imap.c:994 pop3.c:852
+#: imap.c:866
+#, c-format
+msgid "%lu is unseen\n"
+msgstr "%lu is unseen\n"
+
+#: imap.c:878 pop3.c:788
#, c-format
msgid "%u is first unseen\n"
msgstr "%u is first unseen\n"
-#: imap.c:1078
-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:1177 imap.c:1184
-#, c-format
-msgid "Incorrect FETCH response: %s.\n"
-msgstr ""
+#: imap.c:969
+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"
#: interface.c:256
msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem."
@@ -1937,44 +1689,44 @@ msgstr "No interface found with name %s"
msgid "No IP address found for %s"
msgstr "No IP address found for %s"
-#: interface.c:590
+#: interface.c:589
msgid "missing IP interface address\n"
msgstr "missing IP interface address\n"
-#: interface.c:606
+#: interface.c:605
msgid "invalid IP interface address\n"
msgstr "invalid IP interface address\n"
-#: interface.c:612
+#: interface.c:611
msgid "invalid IP interface mask\n"
msgstr "invalid IP interface mask\n"
-#: interface.c:651
+#: interface.c:650
#, c-format
msgid "activity on %s -noted- as %d\n"
msgstr "activity on %s -noted- as %d\n"
-#: interface.c:666
+#: interface.c:665
#, c-format
msgid "skipping poll of %s, %s down\n"
msgstr "skipping poll of %s, %s down\n"
-#: interface.c:685
+#: interface.c:684
#, c-format
msgid "skipping poll of %s, %s IP address excluded\n"
msgstr "skipping poll of %s, %s IP address excluded\n"
-#: interface.c:697
+#: interface.c:696
#, c-format
msgid "activity on %s checked as %d\n"
msgstr "activity on %s checked as %d\n"
-#: interface.c:723
+#: interface.c:722
#, c-format
msgid "skipping poll of %s, %s inactive\n"
msgstr "skipping poll of %s, %s inactive\n"
-#: interface.c:730
+#: interface.c:729
#, c-format
msgid "activity on %s was %d, is %d\n"
msgstr "activity on %s was %d, is %d\n"
@@ -1983,817 +1735,684 @@ msgstr "activity on %s was %d, is %d\n"
msgid "could not decode initial BASE64 challenge\n"
msgstr "could not decode initial BASE64 challenge\n"
-#: kerberos.c:137
+#: kerberos.c:139
#, c-format
msgid "principal %s in ticket does not match -u %s\n"
msgstr "principal %s in ticket does not match -u %s\n"
-#: kerberos.c:145
+#: kerberos.c:147
#, c-format
msgid "non-null instance (%s) might cause strange behavior\n"
msgstr "non-null instance (%s) might cause strange behavior\n"
-#: kerberos.c:211
+#: kerberos.c:213
msgid "could not decode BASE64 ready response\n"
msgstr "could not decode BASE64 ready response\n"
-#: kerberos.c:218
+#: kerberos.c:220
msgid "challenge mismatch\n"
msgstr "challenge mismatch\n"
-#: lock.c:87
+#: lock.c:86
#, c-format
msgid "fetchmail: error reading lockfile \"%s\": %s\n"
msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
-#: lock.c:98
-#, fuzzy, c-format
-msgid "fetchmail: removing stale lockfile \"%s\"\n"
+#: lock.c:96
+msgid "fetchmail: removing stale lockfile\n"
msgstr "fetchmail: removing stale lockfile\n"
-#: lock.c:102
-#, fuzzy, c-format
-msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n"
-msgstr "fetchmail: error opening lockfile \"%s\": %s\n"
-
-#: lock.c:116
-#, fuzzy, c-format
-msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n"
-msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
-
-#: lock.c:126
+#: lock.c:106
#, c-format
msgid "fetchmail: error opening lockfile \"%s\": %s\n"
msgstr "fetchmail: error opening lockfile \"%s\": %s\n"
-#: lock.c:176
-#, fuzzy, c-format
-msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n"
+#: lock.c:153
+msgid "fetchmail: lock creation failed.\n"
msgstr "fetchmail: lock creation failed.\n"
-#: lock.c:187
-#, fuzzy, c-format
-msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n"
-msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
-
-#: netrc.c:220
+#: netrc.c:219
#, c-format
msgid "%s:%d: warning: found \"%s\" before any host names\n"
msgstr "%s:%d: warning: found \"%s\" before any host names\n"
-#: netrc.c:258
+#: netrc.c:257
#, c-format
msgid "%s:%d: warning: unknown token \"%s\"\n"
msgstr "%s:%d: warning: unknown token \"%s\"\n"
-#: ntlmsubr.c:35
-msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n"
-msgstr ""
-
-#: ntlmsubr.c:84
-msgid "NTLM challenge contains invalid data.\n"
-msgstr ""
-
-#: odmr.c:67
+#: odmr.c:66
#, c-format
msgid "%s's SMTP listener does not support ATRN\n"
msgstr "%s's SMTP listener does not support ATRN\n"
-#: odmr.c:105
+#: odmr.c:104
msgid "Turnaround now...\n"
msgstr "Turnaround now...\n"
-#: odmr.c:110
+#: odmr.c:109
msgid "ATRN request refused.\n"
msgstr "ATRN request refused.\n"
-#: odmr.c:114
+#: odmr.c:113
msgid "Unable to process ATRN request now\n"
msgstr "Unable to process ATRN request now\n"
-#: odmr.c:119
+#: odmr.c:118
msgid "You have no mail.\n"
msgstr "You have no mail.\n"
-#: odmr.c:123
+#: odmr.c:122
msgid "Command not implemented\n"
msgstr "Command not implemented\n"
-#: odmr.c:127
+#: odmr.c:126
msgid "Authentication required.\n"
msgstr "Authentication required.\n"
-#: odmr.c:132
-#, fuzzy, c-format
-msgid "Unknown ODMR error \"%s\"\n"
+#: odmr.c:130
+#, c-format
+msgid "Unknown ODMR error %d\n"
msgstr "Unknown ODMR error %d\n"
-#: odmr.c:192
+#: odmr.c:189
msgid "receiving message data\n"
msgstr "receiving message data\n"
-#: odmr.c:245
+#: odmr.c:242
msgid "Option --keep is not supported with ODMR\n"
msgstr "Option --keep is not supported with ODMR\n"
-#: odmr.c:249
+#: odmr.c:246
msgid "Option --flush is not supported with ODMR\n"
msgstr "Option --flush is not supported with ODMR\n"
-#: odmr.c:253
+#: odmr.c:250
msgid "Option --folder is not supported with ODMR\n"
msgstr "Option --folder is not supported with ODMR\n"
-#: odmr.c:257
+#: odmr.c:254
msgid "Option --check is not supported with ODMR\n"
msgstr "Option --check is not supported with ODMR\n"
-#: opie.c:43
+#: opie.c:42
msgid "server recv fatal\n"
msgstr "server recv fatal\n"
-#: opie.c:57
+#: opie.c:56
msgid "Could not decode OTP challenge\n"
msgstr "Could not decode OTP challenge\n"
-#: opie.c:65 pop3.c:587
+#: opie.c:64 pop3.c:552
msgid "Secret pass phrase: "
msgstr "Secret pass phrase: "
-#: options.c:179 options.c:223
+#: options.c:166 options.c:210
#, c-format
msgid "String '%s' is not a valid number string.\n"
msgstr "String '%s' is not a valid number string.\n"
-#: options.c:188
+#: options.c:175
#, c-format
msgid "Value of string '%s' is %s than %d.\n"
msgstr "Value of string '%s' is %s than %d.\n"
-#: options.c:189
+#: options.c:176
msgid "smaller"
msgstr "smaller"
-#: options.c:189
+#: options.c:176
msgid "larger"
msgstr "larger"
#: options.c:337
-#, fuzzy, c-format
-msgid "Invalid bad-header policy `%s' specified.\n"
-msgstr "Invalid protocol `%s' specified.\n"
-
-#: options.c:378
#, c-format
msgid "Invalid protocol `%s' specified.\n"
msgstr "Invalid protocol `%s' specified.\n"
-#: options.c:425
+#: options.c:384
#, c-format
msgid "Invalid authentication `%s' specified.\n"
msgstr "Invalid authentication `%s' specified.\n"
-#: options.c:641
+#: options.c:585
msgid "usage: fetchmail [options] [server ...]\n"
msgstr "usage: fetchmail [options] [server ...]\n"
-#: options.c:642
+#: options.c:586
msgid " Options are as follows:\n"
msgstr " Options are as follows:\n"
-#: options.c:643
+#: options.c:587
msgid " -?, --help display this option help\n"
msgstr " -?, --help display this option help\n"
-#: options.c:644
+#: options.c:588
msgid " -V, --version display version info\n"
msgstr " -V, --version display version info\n"
-#: options.c:646
+#: options.c:590
msgid " -c, --check check for messages without fetching\n"
msgstr " -c, --check check for messages without fetching\n"
-#: options.c:647
+#: options.c:591
msgid " -s, --silent work silently\n"
msgstr " -s, --silent work silently\n"
-#: options.c:648
+#: options.c:592
msgid " -v, --verbose work noisily (diagnostic output)\n"
msgstr " -v, --verbose work noisily (diagnostic output)\n"
-#: options.c:649
+#: options.c:593
msgid " -d, --daemon run as a daemon once per n seconds\n"
msgstr " -d, --daemon run as a daemon once per n seconds\n"
-#: options.c:650
+#: options.c:594
msgid " -N, --nodetach don't detach daemon process\n"
msgstr " -N, --nodetach don't detach daemon process\n"
-#: options.c:651
+#: options.c:595
msgid " -q, --quit kill daemon process\n"
msgstr " -q, --quit kill daemon process\n"
-#: options.c:652
+#: options.c:596
msgid " -L, --logfile specify logfile name\n"
msgstr " -L, --logfile specify logfile name\n"
-#: options.c:653
-msgid ""
-" --syslog use syslog(3) for most messages when running as a "
-"daemon\n"
-msgstr ""
-" --syslog use syslog(3) for most messages when running as a "
-"daemon\n"
-
-#: options.c:654
-msgid " --nosyslog turns off use of syslog(3)\n"
-msgstr ""
+#: options.c:597
+msgid " --syslog use syslog(3) for most messages when running as a daemon\n"
+msgstr " --syslog use syslog(3) for most messages when running as a daemon\n"
-#: options.c:655
+#: options.c:598
msgid " --invisible don't write Received & enable host spoofing\n"
msgstr " --invisible don't write Received & enable host spoofing\n"
-#: options.c:656
+#: options.c:599
msgid " -f, --fetchmailrc specify alternate run control file\n"
msgstr " -f, --fetchmailrc specify alternate run control file\n"
-#: options.c:657
+#: options.c:600
msgid " -i, --idfile specify alternate UIDs file\n"
msgstr " -i, --idfile specify alternate UIDs file\n"
-#: options.c:658
+#: options.c:601
msgid " --pidfile specify alternate PID (lock) file\n"
msgstr " --pidfile specify alternate PID (lock) file\n"
-#: options.c:659
+#: options.c:602
msgid " --postmaster specify recipient of last resort\n"
msgstr " --postmaster specify recipient of last resort\n"
-#: options.c:660
+#: options.c:603
msgid " --nobounce redirect bounces from user to postmaster.\n"
msgstr " --nobounce redirect bounces from user to postmaster.\n"
-#: options.c:661
-msgid ""
-" --nosoftbounce fetchmail deletes permanently undeliverable messages.\n"
-msgstr ""
-
-#: options.c:662
-msgid ""
-" --softbounce keep permanently undeliverable messages on server "
-"(default).\n"
-msgstr ""
-
-#: options.c:664
+#: options.c:605
msgid " -I, --interface interface required specification\n"
msgstr " -I, --interface interface required specification\n"
-#: options.c:665
+#: options.c:606
msgid " -M, --monitor monitor interface for activity\n"
msgstr " -M, --monitor monitor interface for activity\n"
-#: options.c:668
+#: options.c:609
msgid " --ssl enable ssl encrypted session\n"
msgstr " --ssl enable ssl encrypted session\n"
-#: options.c:669
+#: options.c:610
msgid " --sslkey ssl private key file\n"
msgstr " --sslkey ssl private key file\n"
-#: options.c:670
+#: options.c:611
msgid " --sslcert ssl client certificate\n"
msgstr " --sslcert ssl client certificate\n"
-#: options.c:671
+#: options.c:612
msgid " --sslcertck do strict server certificate check (recommended)\n"
msgstr " --sslcertck do strict server certificate check (recommended)\n"
-#: options.c:672
-#, fuzzy
-msgid " --nosslcertck skip strict server certificate check (insecure)\n"
-msgstr " --sslcertck do strict server certificate check (recommended)\n"
-
-#: options.c:673
-#, fuzzy
-msgid " --sslcertfile path to trusted-CA ssl certificate file\n"
+#: options.c:613
+msgid " --sslcertpath path to ssl certificates\n"
msgstr " --sslcertpath path to ssl certificates\n"
-#: options.c:674
-#, fuzzy
-msgid " --sslcertpath path to trusted-CA ssl certificate directory\n"
-msgstr " --sslcertpath path to ssl certificates\n"
-
-#: options.c:675
-msgid ""
-" --sslcommonname expect this CommonName from server (discouraged)\n"
-msgstr ""
+#: options.c:614
+msgid " --sslfingerprint fingerprint that must match that of the server's cert.\n"
+msgstr " --sslfingerprint fingerprint that must match that of the server's cert.\n"
-#: options.c:676
-msgid ""
-" --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-msgstr ""
-" --sslfingerprint fingerprint that must match that of the server's "
-"cert.\n"
-
-#: options.c:677
-#, fuzzy
-msgid " --sslproto force ssl protocol (see manual)\n"
+#: options.c:615
+msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
msgstr " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
-#: options.c:679
+#: options.c:617
msgid " --plugin specify external command to open connection\n"
msgstr " --plugin specify external command to open connection\n"
-#: options.c:680
+#: options.c:618
msgid " --plugout specify external command to open smtp connection\n"
msgstr " --plugout specify external command to open smtp connection\n"
-#: options.c:681
-msgid ""
-" --bad-header {reject|accept}\n"
-" specify policy for handling messages with bad headers\n"
-msgstr ""
-
-#: options.c:684
-#, fuzzy
-msgid " -p, --proto[col] specify retrieval protocol (see man page)\n"
+#: options.c:620
+msgid " -p, --protocol specify retrieval protocol (see man page)\n"
msgstr " -p, --protocol specify retrieval protocol (see man page)\n"
-#: options.c:685
+#: options.c:621
msgid " -U, --uidl force the use of UIDLs (pop3 only)\n"
msgstr " -U, --uidl force the use of UIDLs (pop3 only)\n"
-#: options.c:686
-msgid ""
-" --idle tells the IMAP server to send notice of new messages\n"
-msgstr ""
-
-#: options.c:687
+#: options.c:622
msgid " --port TCP port to connect to (obsolete, use --service)\n"
msgstr " --port TCP port to connect to (obsolete, use --service)\n"
-#: options.c:688
-msgid ""
-" -P, --service TCP service to connect to (can be numeric TCP port)\n"
-msgstr ""
-" -P, --service TCP service to connect to (can be numeric TCP port)\n"
+#: options.c:623
+msgid " -P, --service TCP service to connect to (can be numeric TCP port)\n"
+msgstr " -P, --service TCP service to connect to (can be numeric TCP port)\n"
-#: options.c:689
-#, fuzzy
-msgid " --auth authentication type (see manual)\n"
+#: options.c:624
+msgid " --auth authentication type (password/kerberos/ssh/otp)\n"
msgstr " --auth authentication type (password/kerberos/ssh/otp)\n"
-#: options.c:690
+#: options.c:625
msgid " -t, --timeout server nonresponse timeout\n"
msgstr " -t, --timeout server nonresponse timeout\n"
-#: options.c:691
+#: options.c:626
msgid " -E, --envelope envelope address header\n"
msgstr " -E, --envelope envelope address header\n"
-#: options.c:692
+#: options.c:627
msgid " -Q, --qvirtual prefix to remove from local user id\n"
msgstr " -Q, --qvirtual prefix to remove from local user id\n"
-#: options.c:693
+#: options.c:628
msgid " --principal mail service principal\n"
msgstr " --principal mail service principal\n"
-#: options.c:694
+#: options.c:629
msgid " --tracepolls add poll-tracing information to Received header\n"
msgstr " --tracepolls add poll-tracing information to Received header\n"
-#: options.c:696
-#, fuzzy
-msgid " -u, --user[name] specify users's login on server\n"
+#: options.c:631
+msgid " -u, --username specify users's login on server\n"
msgstr " -u, --username specify users's login on server\n"
-#: options.c:697
+#: options.c:632
msgid " -a, --[fetch]all retrieve old and new messages\n"
msgstr " -a, --[fetch]all retrieve old and new messages\n"
-#: options.c:698
+#: options.c:633
msgid " -K, --nokeep delete new messages after retrieval\n"
msgstr " -K, --nokeep delete new messages after retrieval\n"
-#: options.c:699
+#: options.c:634
msgid " -k, --keep save new messages after retrieval\n"
msgstr " -k, --keep save new messages after retrieval\n"
-#: options.c:700
+#: options.c:635
msgid " -F, --flush delete old messages from server\n"
msgstr " -F, --flush delete old messages from server\n"
-#: options.c:701
+#: options.c:636
msgid " --limitflush delete oversized messages\n"
msgstr " --limitflush delete oversized messages\n"
-#: options.c:702
+#: options.c:637
msgid " -n, --norewrite don't rewrite header addresses\n"
msgstr " -n, --norewrite don't rewrite header addresses\n"
-#: options.c:703
+#: options.c:638
msgid " -l, --limit don't fetch messages over given size\n"
msgstr " -l, --limit don't fetch messages over given size\n"
-#: options.c:704
+#: options.c:639
msgid " -w, --warnings interval between warning mail notification\n"
msgstr " -w, --warnings interval between warning mail notification\n"
-#: options.c:706
+#: options.c:641
msgid " -S, --smtphost set SMTP forwarding host\n"
msgstr " -S, --smtphost set SMTP forwarding host\n"
-#: options.c:707
+#: options.c:642
msgid " --fetchdomains fetch mail for specified domains\n"
msgstr " --fetchdomains fetch mail for specified domains\n"
-#: options.c:708
+#: options.c:643
msgid " -D, --smtpaddress set SMTP delivery domain to use\n"
msgstr " -D, --smtpaddress set SMTP delivery domain to use\n"
-#: options.c:709
+#: options.c:644
msgid " --smtpname set SMTP full name username@domain\n"
msgstr " --smtpname set SMTP full name username@domain\n"
-#: options.c:710
+#: options.c:645
msgid " -Z, --antispam, set antispam response values\n"
msgstr " -Z, --antispam, set antispam response values\n"
-#: options.c:711
+#: options.c:646
msgid " -b, --batchlimit set batch limit for SMTP connections\n"
msgstr " -b, --batchlimit set batch limit for SMTP connections\n"
-#: options.c:712
+#: options.c:647
msgid " -B, --fetchlimit set fetch limit for server connections\n"
msgstr " -B, --fetchlimit set fetch limit for server connections\n"
-#: options.c:713
+#: options.c:648
msgid " --fetchsizelimit set fetch message size limit\n"
msgstr " --fetchsizelimit set fetch message size limit\n"
-#: options.c:714
+#: options.c:649
msgid " --fastuidl do a binary search for UIDLs\n"
msgstr " --fastuidl do a binary search for UIDLs\n"
-#: options.c:715
+#: options.c:650
msgid " -e, --expunge set max deletions between expunges\n"
msgstr " -e, --expunge set max deletions between expunges\n"
-#: options.c:716
+#: options.c:651
msgid " -m, --mda set MDA to use for forwarding\n"
msgstr " -m, --mda set MDA to use for forwarding\n"
-#: options.c:717
+#: options.c:652
msgid " --bsmtp set output BSMTP file\n"
msgstr " --bsmtp set output BSMTP file\n"
-#: options.c:718
+#: options.c:653
msgid " --lmtp use LMTP (RFC2033) for delivery\n"
msgstr " --lmtp use LMTP (RFC2033) for delivery\n"
-#: options.c:719
+#: options.c:654
msgid " -r, --folder specify remote folder name\n"
msgstr " -r, --folder specify remote folder name\n"
-#: options.c:720
+#: options.c:655
msgid " --showdots show progress dots even in logfiles\n"
msgstr " --showdots show progress dots even in logfiles\n"
-#: pop2.c:67
-msgid "POP2 does not support STLS. Giving up.\n"
-msgstr ""
-
-#: pop2.c:73
-msgid "POP2 only supports password authentication. Giving up.\n"
-msgstr ""
-
-#: pop3.c:330
-#, fuzzy
-msgid ""
-"Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n"
-msgstr ""
-"Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
-"of TOP.\n"
-
-#: pop3.c:414
-msgid "TLS is mandatory for this session, but server refused CAPA command.\n"
-msgstr ""
-
-#: pop3.c:415
-msgid "The CAPA command is however necessary for TLS.\n"
-msgstr ""
-
-#: pop3.c:492
-#, fuzzy, c-format
-msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n"
-msgstr "%s: opportunistic upgrade to TLS.\n"
-
-#: pop3.c:498
-#, c-format
-msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n"
-msgstr ""
-
-#: pop3.c:623
-msgid "We've run out of allowed authenticators and cannot continue.\n"
-msgstr ""
+#: pop3.c:342
+msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
+msgstr "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n"
-#: pop3.c:637
+#: pop3.c:590
msgid "Required APOP timestamp not found in greeting\n"
msgstr "Required APOP timestamp not found in greeting\n"
-#: pop3.c:646
+#: pop3.c:599
msgid "Timestamp syntax error in greeting\n"
msgstr "Timestamp syntax error in greeting\n"
-#: pop3.c:662
-msgid "Invalid APOP timestamp.\n"
-msgstr ""
-
-#: pop3.c:686
+#: pop3.c:621
msgid "Undefined protocol request in POP3_auth\n"
msgstr "Undefined protocol request in POP3_auth\n"
-#: pop3.c:707
+#: pop3.c:629
msgid "lock busy! Is another session active?\n"
msgstr "lock busy! Is another session active?\n"
-#: pop3.c:770
+#: pop3.c:708
msgid "Cannot handle UIDL response from upstream server.\n"
msgstr "Cannot handle UIDL response from upstream server.\n"
-#: pop3.c:793
+#: pop3.c:731
msgid "Server responded with UID for wrong message.\n"
msgstr "Server responded with UID for wrong message.\n"
-#: pop3.c:822
-#, fuzzy, c-format
-msgid "id=%s (num=%u) was deleted, but is still present!\n"
+#: pop3.c:758 pop3.c:1004
+#, 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:934
+#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#, c-format
+msgid "%u is unseen\n"
+msgstr "%u is unseen\n"
+
+#: pop3.c:864
msgid "Messages inserted into list on server. Cannot handle this.\n"
msgstr "Messages inserted into list on server. Cannot handle this.\n"
-#: pop3.c:1032
+#: pop3.c:956
msgid "protocol error\n"
msgstr "protocol error\n"
-#: pop3.c:1048
+#: pop3.c:972
msgid "protocol error while fetching UIDLs\n"
msgstr "protocol error while fetching UIDLs\n"
-#: pop3.c:1079
-#, 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:1389
+#: pop3.c:1342
msgid "Option --folder is not supported with POP3\n"
msgstr "Option --folder is not supported with POP3\n"
-#: rcfile_y.y:130
+#: rcfile_y.y:124
msgid "server option after user options"
msgstr "server option after user options"
-#: rcfile_y.y:173
+#: rcfile_y.y:167
msgid "SDPS not enabled."
msgstr "SDPS not enabled."
-#: rcfile_y.y:217
-msgid ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: interface option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:213
+msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"
-#: rcfile_y.y:225
-msgid ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
-msgstr ""
-"fetchmail: monitor option is only supported under Linux (without IPv6) and "
-"FreeBSD\n"
+#: rcfile_y.y:220
+msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
+msgstr "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"
-#: rcfile_y.y:339
+#: rcfile_y.y:333
msgid "SSL is not enabled"
msgstr "SSL is not enabled"
-#: rcfile_y.y:391
+#: rcfile_y.y:382
msgid "end of input"
msgstr "end of input"
-#: rcfile_y.y:429
+#: rcfile_y.y:419
#, c-format
msgid "File %s must be a regular file.\n"
msgstr "File %s must be a regular file.\n"
-#: rcfile_y.y:439
-#, fuzzy, c-format
-msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
+#: rcfile_y.y:429
+#, c-format
+msgid "File %s must have no more than -rwx--x--- (0710) permissions.\n"
msgstr "File %s must have no more than -rwx--x--- (0710) permissions.\n"
-#: rcfile_y.y:451
+#: rcfile_y.y:441
#, c-format
msgid "File %s must be owned by you.\n"
msgstr "File %s must be owned by you.\n"
-#: report.c:67
+#: report.c:77
msgid "Unknown system error"
msgstr "Unknown system error"
-#: report.c:92
-#, fuzzy, c-format
-msgid "%s (log message incomplete)\n"
+#: report.c:104
+#, c-format
+msgid "%s (log message incomplete)"
msgstr "%s (log message incomplete)"
-#: rfc822.c:83
-#, fuzzy, c-format
-msgid "About to rewrite %s...\n"
+#: rfc822.c:76
+#, c-format
+msgid "About to rewrite %s"
msgstr "About to rewrite %s"
-#: rfc822.c:221
-#, fuzzy, c-format
-msgid "...rewritten version is %s.\n"
+#: rfc822.c:212
+#, c-format
+msgid "Rewritten version is %s\n"
msgstr "Rewritten version is %s\n"
-#: rpa.c:118
+#: rpa.c:117
msgid "Success"
msgstr "Success"
-#: rpa.c:119
+#: rpa.c:118
msgid "Restricted user (something wrong with account)"
msgstr "Restricted user (something wrong with account)"
-#: rpa.c:120
+#: rpa.c:119
msgid "Invalid userid or passphrase"
msgstr "Invalid userid or passphrase"
-#: rpa.c:121
+#: rpa.c:120
msgid "Deity error"
msgstr "Deity error"
-#: rpa.c:174
+#: rpa.c:173
msgid "RPA token 2: Base64 decode error\n"
msgstr "RPA token 2: Base64 decode error\n"
-#: rpa.c:185
+#: rpa.c:184
#, c-format
msgid "Service chose RPA version %d.%d\n"
msgstr "Service chose RPA version %d.%d\n"
-#: rpa.c:191
+#: rpa.c:190
#, c-format
msgid "Service challenge (l=%d):\n"
msgstr "Service challenge (l=%d):\n"
-#: rpa.c:200
+#: rpa.c:199
#, c-format
msgid "Service timestamp %s\n"
msgstr "Service timestamp %s\n"
-#: rpa.c:205
+#: rpa.c:204
msgid "RPA token 2 length error\n"
msgstr "RPA token 2 length error\n"
-#: rpa.c:209
+#: rpa.c:208
#, c-format
msgid "Realm list: %s\n"
msgstr "Realm list: %s\n"
-#: rpa.c:213
+#: rpa.c:212
msgid "RPA error in service@realm string\n"
msgstr "RPA error in service@realm string\n"
-#: rpa.c:250
+#: rpa.c:249
msgid "RPA token 4: Base64 decode error\n"
msgstr "RPA token 4: Base64 decode error\n"
-#: rpa.c:261
+#: rpa.c:260
#, c-format
msgid "User authentication (l=%d):\n"
msgstr "User authentication (l=%d):\n"
-#: rpa.c:275
+#: rpa.c:274
#, c-format
msgid "RPA status: %02X\n"
msgstr "RPA status: %02X\n"
-#: rpa.c:281
+#: rpa.c:280
msgid "RPA token 4 length error\n"
msgstr "RPA token 4 length error\n"
-#: rpa.c:288
+#: rpa.c:287
#, c-format
msgid "RPA rejects you: %s\n"
msgstr "RPA rejects you: %s\n"
-#: rpa.c:290
+#: rpa.c:289
msgid "RPA rejects you, reason unknown\n"
msgstr "RPA rejects you, reason unknown\n"
-#: rpa.c:298
+#: rpa.c:297
#, c-format
msgid "RPA User Authentication length error: %d\n"
msgstr "RPA User Authentication length error: %d\n"
-#: rpa.c:303
+#: rpa.c:302
#, c-format
msgid "RPA Session key length error: %d\n"
msgstr "RPA Session key length error: %d\n"
-#: rpa.c:309
+#: rpa.c:308
msgid "RPA _service_ auth fail. Spoof server?\n"
msgstr "RPA _service_ auth fail. Spoof server?\n"
-#: rpa.c:314
+#: rpa.c:313
msgid "Session key established:\n"
msgstr "Session key established:\n"
-#: rpa.c:345
+#: rpa.c:344
msgid "RPA authorisation complete\n"
msgstr "RPA authorisation complete\n"
-#: rpa.c:372
+#: rpa.c:371
msgid "Get response\n"
msgstr "Get response\n"
-#: rpa.c:402
+#: rpa.c:401
#, c-format
msgid "Get response return %d [%s]\n"
msgstr "Get response return %d [%s]\n"
-#: rpa.c:463
+#: rpa.c:462
msgid "Hdr not 60\n"
msgstr "Hdr not 60\n"
-#: rpa.c:484
+#: rpa.c:483
msgid "Token length error\n"
msgstr "Token length error\n"
-#: rpa.c:489
+#: rpa.c:488
#, c-format
msgid "Token Length %d disagrees with rxlen %d\n"
msgstr "Token Length %d disagrees with rxlen %d\n"
-#: rpa.c:495
+#: rpa.c:494
msgid "Mechanism field incorrect\n"
msgstr "Mechanism field incorrect\n"
-#: rpa.c:531
+#: rpa.c:530
#, c-format
msgid "dec64 error at char %d: %x\n"
msgstr "dec64 error at char %d: %x\n"
-#: rpa.c:546
+#: rpa.c:545
msgid "Inbound binary data:\n"
msgstr "Inbound binary data:\n"
-#: rpa.c:582
+#: rpa.c:581
msgid "Outbound data:\n"
msgstr "Outbound data:\n"
-#: rpa.c:645
+#: rpa.c:644
msgid "RPA String too long\n"
msgstr "RPA String too long\n"
-#: rpa.c:650
+#: rpa.c:649
msgid "Unicode:\n"
msgstr "Unicode:\n"
-#: rpa.c:709
+#: rpa.c:708
msgid "RPA Failed open of /dev/urandom. This shouldn't\n"
msgstr "RPA Failed open of /dev/urandom. This shouldn't\n"
-#: rpa.c:710
+#: rpa.c:709
msgid " prevent you logging in, but means you\n"
msgstr " prevent you logging in, but means you\n"
-#: rpa.c:711
+#: rpa.c:710
msgid " cannot be sure you are talking to the\n"
msgstr " cannot be sure you are talking to the\n"
-#: rpa.c:712
+#: rpa.c:711
msgid " service that you think you are (replay\n"
msgstr " service that you think you are (replay\n"
-#: rpa.c:713
+#: rpa.c:712
msgid " attacks by a dishonest service are possible.)\n"
msgstr " attacks by a dishonest service are possible.)\n"
-#: rpa.c:724
+#: rpa.c:723
msgid "User challenge:\n"
msgstr "User challenge:\n"
-#: rpa.c:874
+#: rpa.c:873
msgid "MD5 being applied to data block:\n"
msgstr "MD5 being applied to data block:\n"
-#: rpa.c:887
-#, fuzzy
-msgid "MD5 result is:\n"
+#: rpa.c:886
+msgid "MD5 result is: \n"
msgstr "MD5 result is: \n"
#: servport.c:53
@@ -2810,520 +2429,340 @@ msgstr "Cannot resolve service %s to port number.\n"
msgid "Please specify the service as decimal port number.\n"
msgstr "Please specify the service as decimal port number.\n"
-#: sink.c:231
+#: sink.c:220
#, c-format
msgid "forwarding to %s\n"
msgstr "forwarding to %s\n"
-#: sink.c:319
+#: sink.c:306
msgid "SMTP: (bounce-message body)\n"
msgstr "SMTP: (bounce-message body)\n"
-#: sink.c:322
+#: sink.c:309
#, c-format
msgid "mail from %s bounced to %s\n"
msgstr "mail from %s bounced to %s\n"
-#: sink.c:497 sink.c:590
+#: sink.c:442
+#, c-format
+msgid "Saved error is still %d\n"
+msgstr "Saved error is still %d\n"
+
+#: sink.c:502 sink.c:587
#, c-format
msgid "%cMTP error: %s\n"
msgstr "%cMTP error: %s\n"
-#: sink.c:535
-msgid "SMTP server requires STARTTLS, keeping message.\n"
-msgstr ""
-
-#: sink.c:714
-#, fuzzy, c-format
-msgid "BSMTP file open failed: %s\n"
-msgstr "BSMTP file open or preamble write failed\n"
-
-#: sink.c:760
-#, fuzzy, c-format
-msgid "BSMTP preamble write failed: %s.\n"
+#: sink.c:752
+msgid "BSMTP file open or preamble write failed\n"
msgstr "BSMTP file open or preamble write failed\n"
-#: sink.c:974
+#: sink.c:967
#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
msgstr "%cMTP listener doesn't like recipient address `%s'\n"
-#: sink.c:981
+#: sink.c:974
#, 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:1027
+#: sink.c:1020
msgid "no address matches; no postmaster set.\n"
msgstr "no address matches; no postmaster set.\n"
-#: sink.c:1039
+#: sink.c:1032
#, c-format
msgid "can't even send to %s!\n"
msgstr "can't even send to %s!\n"
-#: sink.c:1045
+#: sink.c:1038
#, c-format
msgid "no address matches; forwarding to %s.\n"
msgstr "no address matches; forwarding to %s.\n"
-#: sink.c:1167
-#, c-format
-msgid "MDA option contains single-quoted %%%c expansion.\n"
-msgstr ""
-
-#: sink.c:1168
-msgid "Refusing to deliver. Check the manual and fix your mda option.\n"
-msgstr ""
-
-#: sink.c:1211
+#: sink.c:1194
#, c-format
msgid "about to deliver with: %s\n"
msgstr "about to deliver with: %s\n"
-#: sink.c:1222
-#, 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:1234
-#, c-format
-msgid "Cannot switch effective user id back to original %ld: %s\n"
-msgstr ""
-
-#: sink.c:1241
+#: sink.c:1218
msgid "MDA open failed\n"
msgstr "MDA open failed\n"
-#: sink.c:1280
+#: sink.c:1255
#, c-format
msgid "%cMTP connect to %s failed\n"
msgstr "%cMTP connect to %s failed\n"
-#: sink.c:1304
+#: sink.c:1279
#, c-format
msgid "can't raise the listener; falling back to %s"
msgstr "can't raise the listener; falling back to %s"
-#: sink.c:1362
-#, 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:1387
+#: sink.c:1341
#, c-format
msgid "Error writing to MDA: %s\n"
msgstr "Error writing to MDA: %s\n"
-#: sink.c:1390
+#: sink.c:1344
#, c-format
msgid "MDA died of signal %d\n"
msgstr "MDA died of signal %d\n"
-#: sink.c:1393
+#: sink.c:1347
#, c-format
msgid "MDA returned nonzero status %d\n"
msgstr "MDA returned nonzero status %d\n"
-#: sink.c:1396
+#: sink.c:1350
#, 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"
+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:1421
+#: sink.c:1372
+msgid "Message termination or close of BSMTP file failed\n"
+msgstr "Message termination or close of BSMTP file failed\n"
+
+#: sink.c:1394
msgid "SMTP listener refused delivery\n"
msgstr "SMTP listener refused delivery\n"
-#: sink.c:1451
+#: sink.c:1424
msgid "LMTP delivery error on EOM\n"
msgstr "LMTP delivery error on EOM\n"
-#: sink.c:1454
+#: sink.c:1427
#, c-format
msgid "Unexpected non-503 response to LMTP EOM: %s\n"
msgstr "Unexpected non-503 response to LMTP EOM: %s\n"
-#: sink.c:1620
-#, fuzzy
-msgid "The Fetchmail Daemon"
+#: sink.c:1582
+msgid ""
+"-- \n"
+"The Fetchmail Daemon"
msgstr ""
"-- \n"
"The Fetchmail Daemon"
-#: smtp.c:81
+#: smtp.c:79
msgid "ESMTP CRAM-MD5 Authentication...\n"
msgstr "ESMTP CRAM-MD5 Authentication...\n"
-#: smtp.c:87 smtp.c:137
+#: smtp.c:86 smtp.c:137
msgid "Server rejected the AUTH command.\n"
msgstr "Server rejected the AUTH command.\n"
-#: smtp.c:95 smtp.c:144 smtp.c:153 smtp.c:159
+#: smtp.c:94 smtp.c:144 smtp.c:154 smtp.c:160
msgid "Bad base64 reply from server.\n"
msgstr "Bad base64 reply from server.\n"
-#: smtp.c:99
+#: smtp.c:98
#, c-format
msgid "Challenge decoded: %s\n"
msgstr "Challenge decoded: %s\n"
-#: smtp.c:116
+#: smtp.c:115
msgid "ESMTP PLAIN Authentication...\n"
msgstr "ESMTP PLAIN Authentication...\n"
-#: smtp.c:131
+#: smtp.c:130
msgid "ESMTP LOGIN Authentication...\n"
msgstr "ESMTP LOGIN Authentication...\n"
-#: smtp.c:348 smtp.c:376
+#: smtp.c:331 smtp.c:354
msgid "smtp listener protocol error\n"
msgstr "smtp listener protocol error\n"
-#: socket.c:112 socket.c:141
+#: socket.c:114 socket.c:140
msgid "fetchmail: malloc failed\n"
msgstr "fetchmail: malloc failed\n"
-#: socket.c:173
+#: socket.c:172
msgid "fetchmail: socketpair failed\n"
msgstr "fetchmail: socketpair failed\n"
-#: socket.c:179
+#: socket.c:178
msgid "fetchmail: fork failed\n"
msgstr "fetchmail: fork failed\n"
-#: socket.c:186
+#: socket.c:185
msgid "dup2 failed\n"
msgstr "dup2 failed\n"
-#: socket.c:192
+#: socket.c:191
#, c-format
msgid "running %s (host %s service %s)\n"
msgstr "running %s (host %s service %s)\n"
-#: socket.c:197
+#: socket.c:194
#, c-format
msgid "execvp(%s) failed\n"
msgstr "execvp(%s) failed\n"
-#: socket.c:272
+#: socket.c:282
#, c-format
msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
msgstr "getaddrinfo(\"%s\",\"%s\") error: %s\n"
-#: socket.c:275
+#: socket.c:285
msgid "Try adding the --service option (see also FAQ item R12).\n"
msgstr "Try adding the --service option (see also FAQ item R12).\n"
-#: socket.c:289 socket.c:292
+#: socket.c:296 socket.c:299
#, c-format
msgid "unknown (%s)"
msgstr "unknown (%s)"
-#: socket.c:295
+#: socket.c:302
#, c-format
msgid "Trying to connect to %s/%s..."
msgstr "Trying to connect to %s/%s..."
-#: socket.c:304
+#: socket.c:310
#, c-format
msgid "cannot create socket: %s\n"
msgstr "cannot create socket: %s\n"
-#: socket.c:306
-#, fuzzy, c-format
-msgid "name %d: cannot create socket family %d type %d: %s\n"
-msgstr "cannot create socket: %s\n"
-
-#: socket.c:324
+#: socket.c:326
msgid "connection failed.\n"
msgstr "connection failed.\n"
-#: socket.c:326
+#: socket.c:328
#, c-format
msgid "connection to %s:%s [%s/%s] failed: %s.\n"
msgstr "connection to %s:%s [%s/%s] failed: %s.\n"
-#: socket.c:327
-#, fuzzy, c-format
-msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
-msgstr "connection to %s:%s [%s/%s] failed: %s.\n"
-
-#: socket.c:333
+#: socket.c:334
msgid "connected.\n"
msgstr "connected.\n"
-#: socket.c:346
-#, c-format
-msgid ""
-"Connection errors for this poll:\n"
-"%s"
-msgstr ""
-
-#: socket.c:416
-#, c-format
-msgid "OpenSSL reported: %s\n"
-msgstr ""
-
-#: socket.c:651
-#, c-format
-msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"
-msgstr ""
-
-#: socket.c:657
-#, fuzzy
-msgid "Server certificate:\n"
-msgstr "Server certificate verification error: %s\n"
-
-#: socket.c:662
-#, c-format
-msgid "Certificate chain, from root to peer, starting at depth %d:\n"
-msgstr ""
-
-#: socket.c:665
-#, c-format
-msgid "Certificate at depth %d:\n"
-msgstr ""
-
-#: socket.c:671
+#: socket.c:660
#, c-format
msgid "Issuer Organization: %s\n"
msgstr "Issuer Organisation: %s\n"
-#: socket.c:674
+#: socket.c:662
msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
msgstr "Warning: Issuer Organsation Name too long (possibly truncated).\n"
-#: socket.c:676
+#: socket.c:664
msgid "Unknown Organization\n"
msgstr "Unknown Organisation\n"
-#: socket.c:678
+#: socket.c:666
#, c-format
msgid "Issuer CommonName: %s\n"
msgstr "Issuer CommonName: %s\n"
-#: socket.c:681
+#: socket.c:668
msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
msgstr "Warning: Issuer CommonName too long (possibly truncated).\n"
-#: socket.c:683
+#: socket.c:670
msgid "Unknown Issuer CommonName\n"
msgstr "Unknown Issuer CommonName\n"
-#: socket.c:689
-#, fuzzy, c-format
-msgid "Subject CommonName: %s\n"
-msgstr "Issuer CommonName: %s\n"
-
-#: socket.c:695
-msgid "Bad certificate: Subject CommonName too long!\n"
-msgstr "Bad certificate: Subject CommonName too long!\n"
-
-#: socket.c:701
-#, fuzzy
-msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
-msgstr "Bad certificate: Subject CommonName too long!\n"
-
-#: socket.c:729
+#: socket.c:674
#, c-format
-msgid "Subject Alternative Name: %s\n"
-msgstr ""
+msgid "Server CommonName: %s\n"
+msgstr "Server CommonName: %s\n"
-#: socket.c:735
-#, fuzzy
-msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
+#: socket.c:678
+msgid "Bad certificate: Subject CommonName too long!\n"
msgstr "Bad certificate: Subject CommonName too long!\n"
-#: socket.c:752
+#: socket.c:724
#, c-format
msgid "Server CommonName mismatch: %s != %s\n"
msgstr "Server CommonName mismatch: %s != %s\n"
-#: socket.c:759
+#: socket.c:730
msgid "Server name not set, could not verify certificate!\n"
msgstr "Server name not set, could not verify certificate!\n"
-#: socket.c:764
+#: socket.c:735
msgid "Unknown Server CommonName\n"
msgstr "Unknown Server CommonName\n"
-#: socket.c:766
+#: socket.c:737
msgid "Server name not specified in certificate!\n"
msgstr "Server name not specified in certificate!\n"
-#: socket.c:778
+#: socket.c:749
msgid "EVP_md5() failed!\n"
msgstr "EVP_md5() failed!\n"
-#: socket.c:782
+#: socket.c:753
msgid "Out of memory!\n"
msgstr "Out of memory!\n"
-#: socket.c:790
+#: socket.c:761
msgid "Digest text buffer too small!\n"
msgstr "Digest text buffer too small!\n"
-#: socket.c:796
+#: socket.c:767
#, c-format
msgid "%s key fingerprint: %s\n"
msgstr "%s key fingerprint: %s\n"
-#: socket.c:800
+#: socket.c:771
#, c-format
msgid "%s fingerprints match.\n"
msgstr "%s fingerprints match.\n"
-#: socket.c:802
+#: socket.c:773
#, c-format
msgid "%s fingerprints do not match!\n"
msgstr "%s fingerprints do not match!\n"
-#: socket.c:814
+#: socket.c:782
#, c-format
msgid "Server certificate verification error: %s\n"
msgstr "Server certificate verification error: %s\n"
-#: socket.c:829
-#, fuzzy, c-format
-msgid "Broken certification chain at: %s\n"
-msgstr "Server certificate verification error: %s\n"
-
-#: socket.c:831
-msgid ""
-"This could mean that the server did not provide the intermediate CA's "
-"certificate(s), which is nothing fetchmail could do anything about. For "
-"details, please see the README.SSL-SERVER document that ships with "
-"fetchmail.\n"
-msgstr ""
-
-#: socket.c:841
+#: socket.c:788
#, c-format
-msgid "Missing trust anchor certificate: %s\n"
-msgstr ""
-
-#: socket.c:844
-msgid ""
-"This could mean that the root CA's signing certificate is not in the trusted "
-"CA certificate location, or that c_rehash needs to be run on the certificate "
-"directory. For details, please see the documentation of --sslcertpath and --"
-"sslcertfile in the manual page. See README.SSL for details.\n"
-msgstr ""
-
-#: socket.c:918 socket.c:996
-msgid "Your OpenSSL version does not support SSLv3.\n"
-msgstr ""
-
-#: socket.c:936 socket.c:1014
-msgid "Your OpenSSL version does not support TLS v1.1.\n"
-msgstr ""
+msgid "unknown issuer (first %d characters): %s\n"
+msgstr "unknown issuer (first %d characters): %s\n"
-#: socket.c:947 socket.c:1025
-msgid "Your OpenSSL version does not support TLS v1.2.\n"
-msgstr ""
-
-#: socket.c:958 socket.c:1036
-msgid "Your OpenSSL version does not support TLS v1.3.\n"
-msgstr ""
-
-#: socket.c:967 socket.c:1046
-#, fuzzy, c-format
-msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"
-msgstr "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-
-#: socket.c:1081
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"
-msgstr ""
-
-#: socket.c:1086
-#, c-format
-msgid ""
-"Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"
-msgstr ""
-
-#: socket.c:1106
+#: socket.c:875
msgid "File descriptor out of range for SSL"
msgstr "File descriptor out of range for SSL"
-#: socket.c:1127
-msgid ""
-"Note that some distributions disable older protocol versions in weird non-"
-"standard ways. Try a newer protocol version.\n"
-msgstr ""
-
-#: socket.c:1195
+#: socket.c:891
#, c-format
-msgid ""
-"Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to "
-"continue.\n"
-msgstr ""
-
-#: socket.c:1210
-#, c-format
-msgid ""
-"Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying "
-"to continue.\n"
-msgstr ""
-
-#: socket.c:1247
-msgid "Server shut down connection prematurely during SSL_connect().\n"
-msgstr ""
-
-#: socket.c:1250
-#, c-format
-msgid "System error during SSL_connect(): %s\n"
-msgstr ""
-
-#: socket.c:1250
-msgid "handshake failed at protocol or connection level."
-msgstr ""
-
-#: socket.c:1270
-msgid "Cannot obtain current SSL/TLS cipher - no session established?\n"
-msgstr ""
-
-#: socket.c:1273
-#, c-format
-msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n"
-msgstr ""
+msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
+msgstr "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
-#: socket.c:1280
+#: socket.c:964
msgid "Certificate/fingerprint verification was somehow skipped!\n"
msgstr "Certificate/fingerprint verification was somehow skipped!\n"
-#: socket.c:1297
-msgid ""
-"Warning: the connection is insecure, continuing anyways. (Better use --"
-"sslcertck!)\n"
-msgstr ""
-
-#: socket.c:1339
+#: socket.c:1042
msgid "Cygwin socket read retry\n"
msgstr "Cygwin socket read retry\n"
-#: socket.c:1342
+#: socket.c:1045
msgid "Cygwin socket read retry failed!\n"
msgstr "Cygwin socket read retry failed!\n"
-#: transact.c:79
+#: transact.c:67
#, c-format
msgid "mapped address %s to local %s\n"
msgstr "mapped address %s to local %s\n"
-#: transact.c:101
+#: transact.c:89
#, c-format
msgid "mapped %s to local %s\n"
msgstr "mapped %s to local %s\n"
-#: transact.c:168
+#: transact.c:156
#, c-format
msgid "passed through %s matching %s\n"
msgstr "passed through %s matching %s\n"
-#: transact.c:240
+#: transact.c:226
#, c-format
msgid ""
"analyzing Received line:\n"
@@ -3332,198 +2771,139 @@ msgstr ""
"analyzing Received line:\n"
"%s"
-#: transact.c:279
+#: transact.c:265
#, 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:285
+#: transact.c:271
#, 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:359
+#: transact.c:345
msgid "no Received address found\n"
msgstr "no Received address found\n"
-#: transact.c:368
+#: transact.c:354
#, c-format
msgid "found Received address `%s'\n"
msgstr "found Received address `%s'\n"
-#: transact.c:613
-#, fuzzy
-msgid "incorrect header line found - see manpage for bad-header option\n"
+#: transact.c:551
+msgid "message delimiter found while scanning headers\n"
+msgstr "message delimiter found while scanning headers\n"
+
+#: transact.c:582
+msgid "incorrect header line found while scanning headers\n"
msgstr "incorrect header line found while scanning headers\n"
-#: transact.c:615
+#: transact.c:584
#, c-format
msgid "line: %s"
msgstr "line: %s"
-#: transact.c:1087 transact.c:1097
-#, c-format
-msgid "Parsing envelope \"%s\" names \"%-.*s\"\n"
-msgstr ""
-
-#: transact.c:1112
-#, fuzzy, c-format
-msgid "Parsing Received names \"%-.*s\"\n"
-msgstr ""
-"analyzing Received line:\n"
-"%s"
-
-#: transact.c:1124
-msgid "No envelope recipient found, resorting to header guessing.\n"
-msgstr ""
-
-#: transact.c:1142
-#, c-format
-msgid "Guessing from header \"%-.*s\".\n"
-msgstr ""
-
-#: transact.c:1157
+#: transact.c:1130
#, c-format
msgid "no local matches, forwarding to %s\n"
msgstr "no local matches, forwarding to %s\n"
-#: transact.c:1172
+#: transact.c:1145
msgid "forwarding and deletion suppressed due to DNS errors\n"
msgstr "forwarding and deletion suppressed due to DNS errors\n"
-#: transact.c:1283
+#: transact.c:1255
msgid "writing RFC822 msgblk.headers\n"
msgstr "writing RFC822 msgblk.headers\n"
-#: transact.c:1302
+#: transact.c:1273
msgid "no recipient addresses matched declared local names"
msgstr "no recipient addresses matched declared local names"
-#: transact.c:1309
+#: transact.c:1280
#, c-format
msgid "recipient address %s didn't match any local name"
msgstr "recipient address %s didn't match any local name"
-#: transact.c:1318
+#: transact.c:1289
msgid "message has embedded NULs"
msgstr "message has embedded NULs"
-#: transact.c:1326
+#: transact.c:1297
msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP listener rejected local recipient addresses: "
-#: transact.c:1376
+#: transact.c:1445
msgid "error writing message text\n"
msgstr "error writing message text\n"
-#: transact.c:1652
+#: uid.c:250
#, c-format
-msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n"
-msgstr ""
-
-#: uid.c:262
-#, fuzzy, c-format
-msgid "Open or read error while reading idfile %s: %s\n"
-msgstr "fetchmail: error reading lockfile \"%s\": %s\n"
-
-#: uid.c:273
-#, fuzzy, c-format
-msgid "Old UID list from %s:\n"
+msgid "Old UID list from %s:"
msgstr "Old UID list from %s:"
-#: uid.c:277 uid.c:286 uid.c:355
+#: uid.c:255 uid.c:266 uid.c:523 uid.c:573
msgid " <empty>"
msgstr " <empty>"
-#: uid.c:284
-#, fuzzy
-msgid "Scratch list of UIDs:\n"
+#: uid.c:262
+msgid "Scratch list of UIDs:"
msgstr "Scratch list of UIDs:"
-#: uid.c:369 uid.c:413
-#, fuzzy, c-format
-msgid "Merged UID list from %s:\n"
+#: uid.c:517 uid.c:569
+#, c-format
+msgid "Merged UID list from %s:"
msgstr "Merged UID list from %s:"
-#: uid.c:372
-#, fuzzy, c-format
-msgid "New UID list from %s:\n"
+#: uid.c:519
+#, c-format
+msgid "New UID list from %s:"
msgstr "New UID list from %s:"
-#: uid.c:402
+#: uid.c:548
+msgid "swapping UID lists\n"
+msgstr "swapping UID lists\n"
+
+#: uid.c:556
msgid "not swapping UID lists, no UIDs seen this query\n"
msgstr "not swapping UID lists, no UIDs seen this query\n"
-#: uid.c:422
+#: uid.c:581
msgid "discarding new UID list\n"
msgstr "discarding new UID list\n"
-#: uid.c:479
+#: uid.c:616
msgid "Deleting fetchids file.\n"
msgstr "Deleting fetchids file.\n"
-#: uid.c:482
+#: uid.c:618
#, c-format
msgid "Error deleting %s: %s\n"
msgstr "Error deleting %s: %s\n"
-#: uid.c:489
+#: uid.c:624
msgid "Writing fetchids file.\n"
msgstr "Writing fetchids file.\n"
-#: uid.c:503 uid.c:512
-#, fuzzy, c-format
-msgid "Write error on fetchids file %s: %s\n"
-msgstr "Writing fetchids file.\n"
-
-#: uid.c:524
+#: uid.c:643
#, c-format
msgid "Error writing to fetchids file %s, old file left in place.\n"
msgstr "Error writing to fetchids file %s, old file left in place.\n"
-#: uid.c:528
+#: uid.c:647
#, c-format
msgid "Cannot rename fetchids file %s to %s: %s\n"
msgstr "Cannot rename fetchids file %s to %s: %s\n"
-#: uid.c:532
+#: uid.c:651
#, c-format
msgid "Cannot open fetchids file %s for writing: %s\n"
msgstr "Cannot open fetchids file %s for writing: %s\n"
-#: xmalloc.c:28
+#: xmalloc.c:33
msgid "malloc failed\n"
msgstr "malloc failed\n"
-#: xmalloc.c:42
+#: xmalloc.c:47
msgid "realloc failed\n"
msgstr "realloc failed\n"
-
-#~ msgid "Subject: Fetchmail unreachable-server warning."
-#~ msgstr "Subject: Fetchmail unreachable-server warning."
-
-#, c-format
-#~ msgid "Fetchmail could not reach the mail server %s:"
-#~ msgstr "Fetchmail could not reach the mail server %s:"
-
-#~ msgid ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-#~ msgstr ""
-#~ "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-
-#~ msgid "Required LOGIN capability not supported by server\n"
-#~ msgstr "Required LOGIN capability not supported by server\n"
-
-#, c-format
-#~ msgid "Saved error is still %d\n"
-#~ msgstr "Saved error is still %d\n"
-
-#, c-format
-#~ msgid "unknown issuer (first %d characters): %s\n"
-#~ msgstr "unknown issuer (first %d characters): %s\n"
-
-#~ msgid "message delimiter found while scanning headers\n"
-#~ msgstr "message delimiter found while scanning headers\n"
-
-#~ msgid "swapping UID lists\n"
-#~ msgstr "swapping UID lists\n"