Update to beta3.

svn path=/branches/BRANCH_6-3/; revision=4919

4 files changed, 223 insertions, 222 deletions

diff --git a/po/ja.po b/po/ja.po
index 1e5b1906..e2c43bc0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: fetchmail 6.3.5-b1\n"
+"Project-Id-Version: fetchmail 6.3.5-b3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-26 00:29+0200\n"
-"PO-Revision-Date: 2006-08-25 07:18+0900\n"
+"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"PO-Revision-Date: 2006-09-29 07:29+0900\n"
 "Last-Translator: Takeshi Hamasaki <hma@syd.odn.ne.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -235,58 +235,58 @@ msgid "Lead server has no name.\n"
 msgstr "Lead server の名前がありません。\n"
 
 #: driver.c:1005
-#, c-format
-msgid "couldn't find canonical DNS name of %s (%s)\n"
+#, fuzzy, c-format
+msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "%s の canonical DNS 名(%s)を検索できませんでした。\n"
 
-#: driver.c:1051
+#: driver.c:1052
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s プロトコルを利用した %s への接続に失敗しました。"
 
-#: driver.c:1067
+#: driver.c:1068
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Fetchmail 警告 : サーバと交信不能"
 
-#: driver.c:1069
+#: driver.c:1070
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail 実行中にメールサーバ %s と交信できませんでした:"
 
-#: driver.c:1095 imap.c:423 pop3.c:465
+#: driver.c:1096 imap.c:423 pop3.c:465
 msgid "SSL connection failed.\n"
 msgstr "SSL による接続に失敗しました。\n"
 
-#: driver.c:1148
+#: driver.c:1149
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "アカウント %s@%s が Lock-busy 状態です。\n"
 
-#: driver.c:1152
+#: driver.c:1153
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "%s@%s のサーバが busy 状態です。\n"
 
-#: driver.c:1157
+#: driver.c:1158
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "%s@%s%s の認証に失敗しました\n"
 
-#: driver.c:1160
+#: driver.c:1161
 msgid " (previously authorized)"
 msgstr "(以前は認証されました)"
 
-#: driver.c:1181
+#: driver.c:1182
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: Fetchmail 実行中 %s@%s の認証に失敗"
 
-#: driver.c:1185
+#: driver.c:1186
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail 実行中に %s@%s 宛に届いたメールを取り出せませんでした。\n"
 
-#: driver.c:1189
+#: driver.c:1190
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -299,7 +299,7 @@ msgstr ""
 "他の要因によるものであると思われますが、何故 login に失敗したのか\n"
 "サーバから有益な情報が送信されていないため、fetchmail では判断しかねます。"
 
-#: driver.c:1195
+#: driver.c:1196
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -318,7 +318,7 @@ msgstr ""
 "fetchmail デーモンは引続き接続を試みます。\n"
 "サービスが復旧しない限り何も通知が出されないことを了承願います。"
 
-#: driver.c:1205
+#: driver.c:1206
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -338,170 +338,170 @@ msgstr ""
 "fetchmail デーモンは引続き接続を試みます。\n"
 "サービスが復旧しない限り何も通知が出されないことを了承願います。"
 
-#: driver.c:1221
+#: driver.c:1222
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "すぐに %s@%s 宛メッセージの再取得を試みます\n"
 
-#: driver.c:1226
+#: driver.c:1227
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "%s@%s に対する不明なログイン又は認証のエラーです。\n"
 
-#: driver.c:1250
+#: driver.c:1251
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "%s@%s に対する認証が行われました。\n"
 
-#: driver.c:1256
+#: driver.c:1257
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: fetchmail %s@%s 認証完了"
 
-#: driver.c:1260
+#: driver.c:1261
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr ""
 "%s@%s のログインが完了し fetchmail によるアクセスが可能となりました。\n"
 
-#: driver.c:1264
+#: driver.c:1265
 msgid "Service has been restored.\n"
 msgstr "サービスが復帰しました。\n"
 
-#: driver.c:1296
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr ""
 "選択をして下さい。選択されない場合はフォルダ %s に再度アクセスします。\n"
 
-#: driver.c:1298
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr ""
 "選択をして下さい。選択されない場合はデフォルトのフォルダに再度アクセスしま"
 "す。\n"
 
-#: driver.c:1310
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "アカウント %s , サーバ %s (フォルダ %s)"
 
-#: driver.c:1313 rcfile_y.y:381
+#: driver.c:1314 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "アカウント %s , サーバ %s"
 
-#: driver.c:1318
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "%s にアクセスしています。\n"
 
-#: driver.c:1322
+#: driver.c:1323
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d 通のメッセージ (そのうち %d 通は %s) が%s宛に届いています"
 
-#: driver.c:1325
+#: driver.c:1326
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "既に読み込んでいます"
 
-#: driver.c:1328
+#: driver.c:1329
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d 通のメッセージが %s 宛に届いています"
 
-#: driver.c:1335
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d バイト)\n"
 
-#: driver.c:1341
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "%s 宛にメッセージは届いていません。\n"
 
-#: driver.c:1374 imap.c:89
+#: driver.c:1375 imap.c:89
 msgid "bogus message count!"
 msgstr "偽造されたメッセージ数!"
 
-#: driver.c:1516
+#: driver.c:1517
 msgid "socket"
 msgstr "socket"
 
-#: driver.c:1519
+#: driver.c:1520
 msgid "missing or bad RFC822 header"
 msgstr "RFC822 ヘッダの欠落か誤謬"
 
-#: driver.c:1522
+#: driver.c:1523
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1525
+#: driver.c:1526
 msgid "client/server synchronization"
 msgstr "クライアント/サーバ同期"
 
-#: driver.c:1528
+#: driver.c:1529
 msgid "client/server protocol"
 msgstr "クライアント/サーバプロトコル"
 
-#: driver.c:1531
+#: driver.c:1532
 msgid "lock busy on server"
 msgstr "サーバの lock busy"
 
-#: driver.c:1534
+#: driver.c:1535
 msgid "SMTP transaction"
 msgstr "SMTP 通信"
 
-#: driver.c:1537
+#: driver.c:1538
 msgid "DNS lookup"
 msgstr "DNS 参照"
 
-#: driver.c:1540
+#: driver.c:1541
 msgid "undefined"
 msgstr "不明なエラー"
 
-#: driver.c:1546
+#: driver.c:1547
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr ""
 "%sエラーが発生しました。%s@%sからメールを受信し SMTP サーバ %s へ送信している"
 "ところでした。\n"
 
-#: driver.c:1548
+#: driver.c:1549
 msgid "unknown"
 msgstr "(不明なホスト)"
 
-#: driver.c:1550
+#: driver.c:1551
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "%sエラーが %s@%s よりメールを受信している最中に発生しました。\n"
 
-#: driver.c:1561
+#: driver.c:1562
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "接続終了後に実行するコマンドがステータス %d を返しました。\n"
 
-#: driver.c:1580
+#: driver.c:1581
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Kerberos V4 には対応しておりません。\n"
 
-#: driver.c:1588
+#: driver.c:1589
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Kerberos V5 には対応しておりません。\n"
 
-#: driver.c:1599
+#: driver.c:1600
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "オプション --flush と %s は同時に設定できません。\n"
 
-#: driver.c:1605
+#: driver.c:1606
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "オプション --all と %s は同時に設定できません。\n"
 
-#: driver.c:1614
+#: driver.c:1615
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "オプション --limit と %s は同時に設定できません。\n"
@@ -878,9 +878,9 @@ msgid "All connections are wedged.  Exiting.\n"
 msgstr "全ての接続が動作不全に陥ってしまいました。終了します。\n"
 
 #: fetchmail.c:814
-#, fuzzy, c-format
+#, c-format
 msgid "sleeping at %s for %d seconds\n"
-msgstr "%s に休眠状態となりました。\n"
+msgstr "%s に休眠状態となり %d秒経過しました。\n"
 
 #: fetchmail.c:838
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index 2f0b9a2a..330b524f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: fetchmail 6.3.5-b1\n"
+"Project-Id-Version: fetchmail 6.3.5-b3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-26 00:29+0200\n"
-"PO-Revision-Date: 2006-08-24 17:50+0200\n"
+"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"PO-Revision-Date: 2006-10-02 07:40+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -233,58 +233,58 @@ msgid "Lead server has no name.\n"
 msgstr "Serwer prowadz�cy nie ma nazwy.\n"
 
 #: driver.c:1005
-#, c-format
-msgid "couldn't find canonical DNS name of %s (%s)\n"
+#, fuzzy, c-format
+msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "nie mog� znale�� kanonicznej nazwy %s (%s)\n"
 
-#: driver.c:1051
+#: driver.c:1052
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "po��czenie %s z %s nie powiod�o si�"
 
-#: driver.c:1067
+#: driver.c:1068
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Subject: Ostrze�enie fetchmaila o nieosi�galnym serwerze."
 
-#: driver.c:1069
+#: driver.c:1070
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail nie m�g� po��czy� si� z serwerem poczty %s:"
 
-#: driver.c:1095 imap.c:423 pop3.c:465
+#: driver.c:1096 imap.c:423 pop3.c:465
 msgid "SSL connection failed.\n"
 msgstr "po��czenie SSL nie powiod�o si�.\n"
 
-#: driver.c:1148
+#: driver.c:1149
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "B��d blokady pliku dla %s@%s\n"
 
-#: driver.c:1152
+#: driver.c:1153
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Serwer zaj�ty dla %s@%s\n"
 
-#: driver.c:1157
+#: driver.c:1158
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "B��d autoryzacji dla %s@%s%s\n"
 
-#: driver.c:1160
+#: driver.c:1161
 msgid " (previously authorized)"
 msgstr " (poprzednio zautoryzowano)"
 
-#: driver.c:1181
+#: driver.c:1182
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Subject: b��d uwierzytelnienia fetchmaila dla %s@%s"
 
-#: driver.c:1185
+#: driver.c:1186
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail nie m�g� pobra� poczty z %s@%s.\n"
 
-#: driver.c:1189
+#: driver.c:1190
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -298,7 +298,7 @@ msgstr ""
 "kt�rego fetchmail nie mo�e rozr�ni�, poniewa� serwer nie wys�a�\n"
 "przydatnego komunikatu o b��dzie."
 
-#: driver.c:1195
+#: driver.c:1196
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -317,7 +317,7 @@ msgstr ""
 "Demon fetchmaila b�dzie nadal pr�bowa� si� po��czy� w ka�dym cyklu.\n"
 "Dalsze powiadomienia do czasu odzyskania us�ugi nie b�d� wysy�ane."
 
-#: driver.c:1205
+#: driver.c:1206
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -336,60 +336,60 @@ msgstr ""
 "Demon fetchmaila b�dzie nadal pr�bowa� si� po��czy� w ka�dym cyklu.\n"
 "Dalsze powiadomienia do czasu wznowienia us�ugi nie b�d� wysy�ane."
 
-#: driver.c:1221
+#: driver.c:1222
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Natychmiastowe ponowne �ci�ganie z %s@%s\n"
 
-#: driver.c:1226
+#: driver.c:1227
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Nieznany login lub b��d uwierzytelniania dla %s@%s\n"
 
-#: driver.c:1250
+#: driver.c:1251
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Autoryzacja powiod�a si� dla %s@%s\n"
 
-#: driver.c:1256
+#: driver.c:1257
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Subject: uwierzytelnienie fetchmaila powiod�o si� dla %s@%s"
 
-#: driver.c:1260
+#: driver.c:1261
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail m�g� zalogowa� si� na %s@%s.\n"
 
-#: driver.c:1264
+#: driver.c:1265
 msgid "Service has been restored.\n"
 msgstr "Us�uga zosta�a wznowiona.\n"
 
-#: driver.c:1296
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "ponowna pr�ba po��czenia z folderem %s\n"
 
-#: driver.c:1298
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr "ponowna pr�ba po��czenia z domy�lnym folderem\n"
 
-#: driver.c:1310
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s na %s (folder %s)"
 
-#: driver.c:1313 rcfile_y.y:381
+#: driver.c:1314 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s na %s"
 
-#: driver.c:1318
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "Pr�ba po��czenia z %s\n"
 
-#: driver.c:1322
+#: driver.c:1323
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
@@ -397,14 +397,14 @@ msgstr[0] "%d list (%d %s) dla %s"
 msgstr[1] "%d listy (%d %s) dla %s"
 msgstr[2] "%d list�w (%d %s) dla %s"
 
-#: driver.c:1325
+#: driver.c:1326
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "widziany"
 msgstr[1] "widziane"
 msgstr[2] "widzianych"
 
-#: driver.c:1328
+#: driver.c:1329
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
@@ -412,94 +412,94 @@ msgstr[0] "%d list dla %s"
 msgstr[1] "%d listy dla %s"
 msgstr[2] "%d list�w dla %s"
 
-#: driver.c:1335
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr "(%d bajt�w).\n"
 
-#: driver.c:1341
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Nie ma poczty dla %s\n"
 
-#: driver.c:1374 imap.c:89
+#: driver.c:1375 imap.c:89
 msgid "bogus message count!"
 msgstr "b��dna liczba list�w!"
 
-#: driver.c:1516
+#: driver.c:1517
 msgid "socket"
 msgstr "gniazda"
 
-#: driver.c:1519
+#: driver.c:1520
 msgid "missing or bad RFC822 header"
 msgstr "w nag��wkach RFC822 (brak lub b��dne)"
 
-#: driver.c:1522
+#: driver.c:1523
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1525
+#: driver.c:1526
 msgid "client/server synchronization"
 msgstr "synchronizacji mi�dzy serwerem i klientem"
 
-#: driver.c:1528
+#: driver.c:1529
 msgid "client/server protocol"
 msgstr "protoko�u mi�dzy serwerem i klientem"
 
-#: driver.c:1531
+#: driver.c:1532
 msgid "lock busy on server"
 msgstr "plik zablokowany na serwerze"
 
-#: driver.c:1534
+#: driver.c:1535
 msgid "SMTP transaction"
 msgstr "transakcji SMTP"
 
-#: driver.c:1537
+#: driver.c:1538
 msgid "DNS lookup"
 msgstr "DNS-u"
 
-#: driver.c:1540
+#: driver.c:1541
 msgid "undefined"
 msgstr "nieokre�lony"
 
-#: driver.c:1546
+#: driver.c:1547
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "b��d %s podczas pobierania z %s@%s i dostarczania po SMTP do %s\n"
 
-#: driver.c:1548
+#: driver.c:1549
 msgid "unknown"
 msgstr "nieznany"
 
-#: driver.c:1550
+#: driver.c:1551
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "b��d %s podczas pobierania list�w z %s@%s\n"
 
-#: driver.c:1561
+#: driver.c:1562
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "polecenie wykonane po pobraniu poczty zwr�ci�o b��d %d\n"
 
-#: driver.c:1580
+#: driver.c:1581
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Obs�uga Kerberosa V4 nie zosta�a do��czona do programu.\n"
 
-#: driver.c:1588
+#: driver.c:1589
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Obs�uga Kerberosa V5 nie zosta�a do��czona do programu.\n"
 
-#: driver.c:1599
+#: driver.c:1600
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Opcja --flush nie dzia�a z %s\n"
 
-#: driver.c:1605
+#: driver.c:1606
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Opcja --all nie dzia�a za %s\n"
 
-#: driver.c:1614
+#: driver.c:1615
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Opcja --limit nie dzia�a z %s\n"
@@ -876,9 +876,9 @@ msgid "All connections are wedged.  Exiting.\n"
 msgstr "Nie mog� pobra� poczty z �adnego serwera. Ko�cz� prac�.\n"
 
 #: fetchmail.c:814
-#, fuzzy, c-format
+#, c-format
 msgid "sleeping at %s for %d seconds\n"
-msgstr "usypiam o godzinie %s\n"
+msgstr "usypiam o godzinie %s na %d sekund\n"
 
 #: fetchmail.c:838
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 5f75a05e..965c3cef 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,4 +1,4 @@
-# Translation of fetchmail-6.3.5-b1.po to Russian
+# Translation of fetchmail-6.3.5-b3.po to Russian
 # Copyright (C) 2005 Eric S. Raymond
 # This file is distributed under the same license as the fetchmail package.
 #
@@ -6,10 +6,10 @@
 # Pavel Maryanov <acid_jack@ukr.net>, 2003, 2005, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: fetchmail-6.3.5-b1\n"
+"Project-Id-Version: fetchmail 6.3.5-b3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-26 00:29+0200\n"
-"PO-Revision-Date: 2006-08-26 18:57+0300\n"
+"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"PO-Revision-Date: 2006-09-29 15:51+0300\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -236,58 +236,58 @@ msgid "Lead server has no name.\n"
 msgstr "������� ������ ��� �����.\n"
 
 #: driver.c:1005
-#, c-format
-msgid "couldn't find canonical DNS name of %s (%s)\n"
+#, fuzzy, c-format
+msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "���������� ���� ����� ������������ ��� DNS %s (%s)\n"
 
-#: driver.c:1051
+#: driver.c:1052
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "%s-����������� � %s ����������� ��������"
 
-#: driver.c:1067
+#: driver.c:1068
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "����: �������������� Fetchmail � ������������� �������."
 
-#: driver.c:1069
+#: driver.c:1070
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail �� ���� ���������� ����� � �������� �������� %s:"
 
-#: driver.c:1095 imap.c:423 pop3.c:465
+#: driver.c:1096 imap.c:423 pop3.c:465
 msgid "SSL connection failed.\n"
 msgstr "����������� ����� SSL ����������� ��������.\n"
 
-#: driver.c:1148
+#: driver.c:1149
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "������ ���������� ��������� ��� %s@%s\n"
 
-#: driver.c:1152
+#: driver.c:1153
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "������ ��������� ������� ��� %s@%s\n"
 
-#: driver.c:1157
+#: driver.c:1158
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "����������� ����������� �������� ��� %s@%s%s\n"
 
-#: driver.c:1160
+#: driver.c:1161
 msgid " (previously authorized)"
 msgstr " (����� ������������)"
 
-#: driver.c:1181
+#: driver.c:1182
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "����: �������������� fetchmail ����������� �������� ��� %s@%s"
 
-#: driver.c:1185
+#: driver.c:1186
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail �� ���� �������� ����� �� %s@%s.\n"
 
-#: driver.c:1189
+#: driver.c:1190
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -301,7 +301,7 @@ msgstr ""
 "fetchmail �� ���� ���������� ��-�� ����, ��� ������ �� ��������\n"
 "��������� �� ������."
 
-#: driver.c:1195
+#: driver.c:1196
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -321,7 +321,7 @@ msgstr ""
 "������������. � ���������� ����������� ������������ �� ����� �� ���\n"
 "���, ���� ������ �� ����� �������������."
 
-#: driver.c:1205
+#: driver.c:1206
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -344,168 +344,168 @@ msgstr ""
 "������������ �� ����� �� ��� ���, ���� ������ �� �����\n"
 "�������������."
 
-#: driver.c:1221
+#: driver.c:1222
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "���������� ��������� ����� ��� %s@%s\n"
 
-#: driver.c:1226
+#: driver.c:1227
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "����������� ����� ��� ������ �������������� ��� %s@%s\n"
 
-#: driver.c:1250
+#: driver.c:1251
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "����������� ��������� ��� %s@%s\n"
 
-#: driver.c:1256
+#: driver.c:1257
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "����: ��������� ����������� fetchmail ��� %s@%s"
 
-#: driver.c:1260
+#: driver.c:1261
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail ����� � ������� %s@%s.\n"
 
-#: driver.c:1264
+#: driver.c:1265
 msgid "Service has been restored.\n"
 msgstr "������ ���� �������������.\n"
 
-#: driver.c:1296
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "���������� ��� ����������� ����� �������� %s\n"
 
-#: driver.c:1298
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr "���������� ��� ����������� ����� �������� �� ���������\n"
 
-#: driver.c:1310
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s �� %s (������� %s)"
 
-#: driver.c:1313 rcfile_y.y:381
+#: driver.c:1314 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s �� %s"
 
-#: driver.c:1318
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "������������ %s\n"
 
-#: driver.c:1322
+#: driver.c:1323
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d ��������� (%d %s) ��� %s"
 msgstr[1] "%d ��������� (%d %s) ��� %s"
 
-#: driver.c:1325
+#: driver.c:1326
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "�����������"
 msgstr[1] "�����������"
 
-#: driver.c:1328
+#: driver.c:1329
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d ��������� ��� %s"
 msgstr[1] "%d ��������� ��� %s"
 
-#: driver.c:1335
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d �������).\n"
 
-#: driver.c:1341
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "��� %s ����� ���\n"
 
-#: driver.c:1374 imap.c:89
+#: driver.c:1375 imap.c:89
 msgid "bogus message count!"
 msgstr "��������� ���������� ���������!"
 
-#: driver.c:1516
+#: driver.c:1517
 msgid "socket"
 msgstr "�����"
 
-#: driver.c:1519
+#: driver.c:1520
 msgid "missing or bad RFC822 header"
 msgstr "����������� ��� �������� ��������� RFC822"
 
-#: driver.c:1522
+#: driver.c:1523
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1525
+#: driver.c:1526
 msgid "client/server synchronization"
 msgstr "������������� ������/������"
 
-#: driver.c:1528
+#: driver.c:1529
 msgid "client/server protocol"
 msgstr "�������� ������/������"
 
-#: driver.c:1531
+#: driver.c:1532
 msgid "lock busy on server"
 msgstr "���������� ��������� �� �������"
 
-#: driver.c:1534
+#: driver.c:1535
 msgid "SMTP transaction"
 msgstr "SMTP-����������"
 
-#: driver.c:1537
+#: driver.c:1538
 msgid "DNS lookup"
 msgstr "DNS-������"
 
-#: driver.c:1540
+#: driver.c:1541
 msgid "undefined"
 msgstr "��������̣����"
 
-#: driver.c:1546
+#: driver.c:1547
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "������ %s ��� ������� �� %s@%s � �������� �� ���� SMTP %s\n"
 
-#: driver.c:1548
+#: driver.c:1549
 msgid "unknown"
 msgstr "�����."
 
-#: driver.c:1550
+#: driver.c:1551
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "������ %s ��� ������� �� %s@%s\n"
 
-#: driver.c:1561
+#: driver.c:1562
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr ""
 "�������, ����������� ����� ����������, ����������� �������� �� �������� %d\n"
 
-#: driver.c:1580
+#: driver.c:1581
 msgid "Kerberos V4 support not linked.\n"
 msgstr "��������� Kerberos V4 �� �������.\n"
 
-#: driver.c:1588
+#: driver.c:1589
 msgid "Kerberos V5 support not linked.\n"
 msgstr "��������� Kerberos V5 �� �������.\n"
 
-#: driver.c:1599
+#: driver.c:1600
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "����� --flush �� �������������� � %s\n"
 
-#: driver.c:1605
+#: driver.c:1606
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "����� --all �� �������������� � %s\n"
 
-#: driver.c:1614
+#: driver.c:1615
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "����� --limit �� �������������� � %s\n"
@@ -887,9 +887,9 @@ msgid "All connections are wedged.  Exiting.\n"
 msgstr "��� ���������� �����������.  ���������� ������.\n"
 
 #: fetchmail.c:814
-#, fuzzy, c-format
+#, c-format
 msgid "sleeping at %s for %d seconds\n"
-msgstr "� ������ ������ �� %s\n"
+msgstr "� ������ ������ � %s �� %d ������\n"
 
 #: fetchmail.c:838
 #, c-format
diff --git a/po/vi.po b/po/vi.po
index 1c06c4b9..4b373734 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,12 +1,13 @@
 # Vietnamese translation for Fetchmail.
-# Copyright © 2006  Clytie Siddall <clytie@riverland.net.au>
+# Copyright © 2006 Eric S. Raymond
+# Clytie Siddall <clytie@riverland.net.au>, 2006.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: fetchmail 6.3.5-b1\n"
+"Project-Id-Version: fetchmail 6.3.5-b3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-26 00:29+0200\n"
-"PO-Revision-Date: 2006-08-26 16:01+0930\n"
+"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"PO-Revision-Date: 2006-09-30 22:55+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -218,58 +219,58 @@ msgid "Lead server has no name.\n"
 msgstr "Máy phục vụ đi trước không có tên.\n"
 
 #: driver.c:1005
-#, c-format
-msgid "couldn't find canonical DNS name of %s (%s)\n"
+#, fuzzy, c-format
+msgid "couldn't find canonical DNS name of %s (%s): %s\n"
 msgstr "không tìm thấy tên DNS đúng tiêu chuẩ của %s (%s)\n"
 
-#: driver.c:1051
+#: driver.c:1052
 #, c-format
 msgid "%s connection to %s failed"
 msgstr "kết nối %s đến %s bị lỗi"
 
-#: driver.c:1067
+#: driver.c:1068
 msgid "Subject: Fetchmail unreachable-server warning."
 msgstr "Chủ đề : cảnh báo Fetchmail về máy phục vụ không tới được"
 
-#: driver.c:1069
+#: driver.c:1070
 #, c-format
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail không thể tới máy phục vụ thư %s:"
 
-#: driver.c:1095 imap.c:423 pop3.c:465
+#: driver.c:1096 imap.c:423 pop3.c:465
 msgid "SSL connection failed.\n"
 msgstr "Kết nối SSL đã thất bại.\n"
 
-#: driver.c:1148
+#: driver.c:1149
 #, c-format
 msgid "Lock-busy error on %s@%s\n"
 msgstr "Gặp lỗi kiểu khoá-bận trên %s@%s\n"
 
-#: driver.c:1152
+#: driver.c:1153
 #, c-format
 msgid "Server busy error on %s@%s\n"
 msgstr "Gặp lỗi kiểu máy phục vụ bận trên %s@%s\n"
 
-#: driver.c:1157
+#: driver.c:1158
 #, c-format
 msgid "Authorization failure on %s@%s%s\n"
 msgstr "Việc xác thực bị lỗi trên %s@%s%s\n"
 
-#: driver.c:1160
+#: driver.c:1161
 msgid " (previously authorized)"
 msgstr " (đã cho quyền trước này)"
 
-#: driver.c:1181
+#: driver.c:1182
 #, c-format
 msgid "Subject: fetchmail authentication failed on %s@%s"
 msgstr "Chủ đề : việc xác thực fetchmail bị lỗi trên %s@%s"
 
-#: driver.c:1185
+#: driver.c:1186
 #, c-format
 msgid "Fetchmail could not get mail from %s@%s.\n"
 msgstr "Fetchmail không thể lấy thư từ %s@%s.\n"
 
-#: driver.c:1189
+#: driver.c:1190
 msgid ""
 "The attempt to get authorization failed.\n"
 "Since we have already succeeded in getting authorization for this\n"
@@ -282,7 +283,7 @@ msgstr ""
 "chế độ thất bại khác (v.d. máy phục vụ bận tạm) mà fetchmail\n"
 "không thể phân biệt vì máy phục vụ chưa gởi thông điệp lỗi hữu ích."
 
-#: driver.c:1195
+#: driver.c:1196
 msgid ""
 "\n"
 "However, if you HAVE changed your account details since starting the\n"
@@ -301,7 +302,7 @@ msgstr ""
 "Trình nền fetchmail sẽ tiếp tục chạy, và cố kết nối, trong mỗi chu kỳ.\n"
 "Không có thông báo sau sẽ được gởi đến khi dịch vụ được phục hồi."
 
-#: driver.c:1205
+#: driver.c:1206
 msgid ""
 "The attempt to get authorization failed.\n"
 "This probably means your password is invalid, but some servers have\n"
@@ -320,165 +321,165 @@ msgstr ""
 "Trình nền fetchmail sẽ tiếp tục chạy, và cố kết nối, trong mỗi chu kỳ.\n"
 "Không có thông báo sau sẽ được gởi đến khi dịch vụ được phục hồi."
 
-#: driver.c:1221
+#: driver.c:1222
 #, c-format
 msgid "Repoll immediately on %s@%s\n"
 msgstr "Thăm dò lại ngay trên %s@%s\n"
 
-#: driver.c:1226
+#: driver.c:1227
 #, c-format
 msgid "Unknown login or authentication error on %s@%s\n"
 msgstr "Lỗi đăng nhập hay xác thực không rõ trên %s@%s\n"
 
-#: driver.c:1250
+#: driver.c:1251
 #, c-format
 msgid "Authorization OK on %s@%s\n"
 msgstr "Đã được quyền trên %s@%s\n"
 
-#: driver.c:1256
+#: driver.c:1257
 #, c-format
 msgid "Subject: fetchmail authentication OK on %s@%s"
 msgstr "Chủ đề : fetchmail đã được quyền trên %s@%s"
 
-#: driver.c:1260
+#: driver.c:1261
 #, c-format
 msgid "Fetchmail was able to log into %s@%s.\n"
 msgstr "Fetchmail đã đăng nhập được vào %s@%s.\n"
 
-#: driver.c:1264
+#: driver.c:1265
 msgid "Service has been restored.\n"
 msgstr "Dịch vụ đã được phục hồi.\n"
 
-#: driver.c:1296
+#: driver.c:1297
 #, c-format
 msgid "selecting or re-polling folder %s\n"
 msgstr "đang chọn hoặc thăm dò thư mục %s\n"
 
-#: driver.c:1298
+#: driver.c:1299
 msgid "selecting or re-polling default folder\n"
 msgstr "đang chọn hoặc thăm dò thư mục mặc định\n"
 
-#: driver.c:1310
+#: driver.c:1311
 #, c-format
 msgid "%s at %s (folder %s)"
 msgstr "%s lúc %s (thư mục %s)"
 
-#: driver.c:1313 rcfile_y.y:381
+#: driver.c:1314 rcfile_y.y:381
 #, c-format
 msgid "%s at %s"
 msgstr "%s lúc %s"
 
-#: driver.c:1318
+#: driver.c:1319
 #, c-format
 msgid "Polling %s\n"
 msgstr "Đang thăm dò %s...\n"
 
-#: driver.c:1322
+#: driver.c:1323
 #, c-format
 msgid "%d message (%d %s) for %s"
 msgid_plural "%d messages (%d %s) for %s"
 msgstr[0] "%d thư (%d %s) cho %s"
 
-#: driver.c:1325
+#: driver.c:1326
 msgid "seen"
 msgid_plural "seen"
 msgstr[0] "đã thấy"
 
-#: driver.c:1328
+#: driver.c:1329
 #, c-format
 msgid "%d message for %s"
 msgid_plural "%d messages for %s"
 msgstr[0] "%d thư cho %s"
 
-#: driver.c:1335
+#: driver.c:1336
 #, c-format
 msgid " (%d octets).\n"
 msgstr " (%d octet).\n"
 
-#: driver.c:1341
+#: driver.c:1342
 #, c-format
 msgid "No mail for %s\n"
 msgstr "Không có thư cho %s\n"
 
-#: driver.c:1374 imap.c:89
+#: driver.c:1375 imap.c:89
 msgid "bogus message count!"
 msgstr "số đếm thư giả !"
 
-#: driver.c:1516
+#: driver.c:1517
 msgid "socket"
 msgstr "ổ cắm"
 
-#: driver.c:1519
+#: driver.c:1520
 msgid "missing or bad RFC822 header"
 msgstr "dòng đầu RFC822 xấu hay còn thiếu"
 
 # Name: don't translate / Tên: đừng dịch
-#: driver.c:1522
+#: driver.c:1523
 msgid "MDA"
 msgstr "MDA"
 
-#: driver.c:1525
+#: driver.c:1526
 msgid "client/server synchronization"
 msgstr "đồng bộ hoá ứng dụng khách/trình phục vụ"
 
-#: driver.c:1528
+#: driver.c:1529
 msgid "client/server protocol"
 msgstr "giao thức ứng dụng khách/trình phục vụ"
 
-#: driver.c:1531
+#: driver.c:1532
 msgid "lock busy on server"
 msgstr "khoá bận trên máy phục vụ"
 
-#: driver.c:1534
+#: driver.c:1535
 msgid "SMTP transaction"
 msgstr "giao tác SMTP"
 
-#: driver.c:1537
+#: driver.c:1538
 msgid "DNS lookup"
 msgstr "Tra cứu DNS"
 
-#: driver.c:1540
+#: driver.c:1541
 msgid "undefined"
 msgstr "chưa xác định"
 
-#: driver.c:1546
+#: driver.c:1547
 #, c-format
 msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n"
 msgstr "Gặp lỗi %s trong khi lấy từ %s@%s và phát cho máy SMTP %s\n"
 
-#: driver.c:1548
+#: driver.c:1549
 msgid "unknown"
 msgstr "không rõ"
 
-#: driver.c:1550
+#: driver.c:1551
 #, c-format
 msgid "%s error while fetching from %s@%s\n"
 msgstr "Gặp lỗi %s trong khi lấy từ %s@%s\n"
 
-#: driver.c:1561
+#: driver.c:1562
 #, c-format
 msgid "post-connection command failed with status %d\n"
 msgstr "lệnh cuối cùng kết nối đã thất bại với trạng thái là %d\n"
 
-#: driver.c:1580
+#: driver.c:1581
 msgid "Kerberos V4 support not linked.\n"
 msgstr "Chưa liên kết cách hỗ trợ Kerberos V4.\n"
 
-#: driver.c:1588
+#: driver.c:1589
 msgid "Kerberos V5 support not linked.\n"
 msgstr "Chưa liên kết cách hỗ trợ Kerberos V5.\n"
 
-#: driver.c:1599
+#: driver.c:1600
 #, c-format
 msgid "Option --flush is not supported with %s\n"
 msgstr "Không hỗ trợ tùy chọn « --flush » (xoá sạch) với %s\n"
 
-#: driver.c:1605
+#: driver.c:1606
 #, c-format
 msgid "Option --all is not supported with %s\n"
 msgstr "Không hỗ trợ tùy chọn « --all » (tất cả) với %s\n"
 
-#: driver.c:1614
+#: driver.c:1615
 #, c-format
 msgid "Option --limit is not supported with %s\n"
 msgstr "Không hỗ trợ tùy chọn « --limit » (hạn chế) với %s\n"
@@ -857,9 +858,9 @@ msgid "All connections are wedged.  Exiting.\n"
 msgstr "Mọi sự kết nối là bế tắc nên thoát.\n"
 
 #: fetchmail.c:814
-#, fuzzy, c-format
+#, c-format
 msgid "sleeping at %s for %d seconds\n"
-msgstr "đang ngủ tại %s\n"
+msgstr "đang ngủ tại %s trong %d giây\n"
 
 #: fetchmail.c:838
 #, c-format