aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--po/ja.po75
-rw-r--r--po/pl.po69
-rw-r--r--po/ru.po89
-rw-r--r--po/vi.po77
5 files changed, 138 insertions, 175 deletions
diff --git a/NEWS b/NEWS
index 6248106c..673169f7 100644
--- a/NEWS
+++ b/NEWS
@@ -131,7 +131,8 @@ fetchmail 6.3.5 (not yet released):
Götz 'nimrill' Babin-Ebell, BerliOS patch #1095.
# TRANSLATION UPDATES:
-* Russian/ru (Pavel Maryanov), Vietnamese/vi (Clytie Siddall)
+* Japanese/ja (Takeshi Hamasaki), Polish/pl (Jakub Bogusz),
+ Russian/ru (Pavel Maryanov), Vietnamese/vi (Clytie Siddall)
# CONTRIBUTED SCRIPTS:
* PopDel.py was revised by Joshua Crawford to display the From: address and
diff --git a/po/ja.po b/po/ja.po
index efe118cd..bff51f2e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,14 +2,14 @@
# Copyright (C) 2005-2006 Eric S. Raymond
# Copyright (C) 2002 Free Software Foundation, Inc.
# Takeshi Hamasaki <hma@syd.odn.ne.jp>, 2005-2006
-# based on the work by Jumpei Baba <jbaba@wb3.so-net.ne.jp>, 2002
+# based on the work by Jumpei Baba <jbaba@wb3.so-net.ne.jp>, 2002
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.4-rc1\n"
+"Project-Id-Version: fetchmail 6.3.5-b1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
"POT-Creation-Date: 2006-08-15 01:30+0200\n"
-"PO-Revision-Date: 2006-04-15 14:17+0900\n"
+"PO-Revision-Date: 2006-08-25 07:18+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"
@@ -130,9 +130,9 @@ msgid " (%d header octets)"
msgstr " (%d バイト (ヘッダ) )"
#: driver.c:682
-#, fuzzy, c-format
+#, c-format
msgid " (%d body octets)"
-msgstr " (%d バイト (本体) )"
+msgstr " (本文 %d オクテット)"
#: driver.c:743
#, c-format
@@ -771,16 +771,14 @@ msgid "Enter password for %s@%s: "
msgstr "%s@%s にログインするためのパスワードを入力して下さい : "
#: fetchmail.c:545 fetchmail.c:581
-#, fuzzy
msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
msgstr ""
-"fetchmail: 警告 : %s より multidrop fetch を確認するための DNS が有効でありま"
-"せん。\n"
+"fetchmail: 警告 : syslog とログファイルが設定されました。ログはそちらを見てく"
+"ださい。\n"
#: fetchmail.c:557
-#, fuzzy
msgid "fetchmail: Cannot detach into background. Aborting.\n"
-msgstr "fetchmail: 他の fetchmail は実行されていません。\n"
+msgstr "fetchmail: バックグラウンドに移れません。終了します。\n"
#: fetchmail.c:561
#, c-format
@@ -972,9 +970,10 @@ msgstr ""
"ん。\n"
#: fetchmail.c:1293
-#, fuzzy
msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr "fetchall と keep オプションはデーモンモードで設定できません。\n"
+msgstr ""
+"fetchall と keep オプションはデーモンモード、休止モードでは同時に指定できませ"
+"ん。\n"
#: fetchmail.c:1318
#, c-format
@@ -1298,11 +1297,11 @@ msgstr " MIME のデコードを行いません。 (mimedecode off)\n"
#: fetchmail.c:1659
msgid " Idle after poll is enabled (idle on).\n"
-msgstr " サーバアクセス後の待機を行います。 (idle on)\n"
+msgstr " サーバアクセス後、休止します。 (idle on)\n"
#: fetchmail.c:1660
msgid " Idle after poll is disabled (idle off).\n"
-msgstr " サーバアクセス後の待機を行いません。 (idle off)\n"
+msgstr " サーバアクセス後、休止しません。 (idle off)\n"
#: fetchmail.c:1662
msgid " Nonempty Status lines will be discarded (dropstatus on)\n"
@@ -1671,7 +1670,7 @@ msgstr "接続の後、休止します。\n"
#: imap.c:427 pop3.c:469
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
-msgstr ""
+msgstr "%s: TLS へのアップグレードに適合。\n"
#: imap.c:540
msgid "Required OTP capability not compiled into fetchmail\n"
@@ -2082,10 +2081,9 @@ msgid ""
msgstr " --sslfingerprint サーバの証明書と一致するべき fingerprint\n"
#: options.c:615
-#, fuzzy
msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
msgstr ""
-" --sslproto SSL のプロトコルを強制的に指定します (ssl2/ssl3/tls1)\n"
+" --sslproto SSL のプロトコルを強制的に指定します (SSL2/SSL3/TLS1)\n"
#: options.c:617
msgid " --plugin specify external command to open connection\n"
@@ -2281,7 +2279,7 @@ msgid "Server responded with UID for wrong message.\n"
msgstr "サーバが誤ったメッセージの UID に応答しました。\n"
#: pop3.c:758 pop3.c:1004
-#, fuzzy, c-format
+#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) は削除されましたが、まだ存在しています!\n"
@@ -2642,9 +2640,9 @@ msgid "can't raise the listener; falling back to %s"
msgstr "通信先のアプリケーションと交信できません。%s と交信します。"
#: sink.c:1341
-#, fuzzy, c-format
+#, c-format
msgid "Error writing to MDA: %s\n"
-msgstr "エラーです。削除しています %s: %s\n"
+msgstr "MDAへの書き込みでエラーが発生しました: %s\n"
#: sink.c:1344
#, c-format
@@ -2657,10 +2655,12 @@ msgid "MDA returned nonzero status %d\n"
msgstr "MDA が 0 以外のステータス %d を返して終了しました。\n"
#: sink.c:1350
-#, fuzzy, c-format
+#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr "異常: MDA の pclose が %d を返しました。%s:%d\n"
+msgstr ""
+"異常: MDA の pclose が %d を返しました。エラー番号%d/%s 、どうしていいかわか"
+"りません。ファイル %s:%d 行\n"
#: sink.c:1372
msgid "Message termination or close of BSMTP file failed\n"
@@ -2753,34 +2753,32 @@ msgstr ""
"オプション --service を足して試してください(FAQ の R12 も参照のこと)。\n"
#: socket.c:296 socket.c:299
-#, fuzzy, c-format
+#, c-format
msgid "unknown (%s)"
-msgstr "(不明なホスト)"
+msgstr "不明 (%s)"
#: socket.c:302
#, c-format
msgid "Trying to connect to %s/%s..."
-msgstr ""
+msgstr "%s/%s へ接続しようとしています..."
#: socket.c:310
-#, fuzzy, c-format
+#, c-format
msgid "cannot create socket: %s\n"
-msgstr "%s に対してさえ送信できません。\n"
+msgstr "ソケット %s を作成できません\n"
#: socket.c:326
-#, fuzzy
msgid "connection failed.\n"
-msgstr "SSL による接続に失敗しました。\n"
+msgstr "接続に失敗しました。\n"
#: socket.c:328
-#, fuzzy, c-format
+#, c-format
msgid "connection to %s:%s [%s/%s] failed: %s.\n"
-msgstr "%s プロトコルを利用した %s への接続に失敗しました。"
+msgstr "%s:%s への接続に失敗しました。バッファ [%s/%s] : %s\n"
#: socket.c:334
-#, fuzzy
msgid "connected.\n"
-msgstr "SSL による接続に失敗しました。\n"
+msgstr "接続しました。\n"
#: socket.c:662
#, c-format
@@ -2896,9 +2894,9 @@ msgid "Cygwin socket read retry failed!\n"
msgstr "Cygwin ソケット読み込み リトライ が失敗しました!\n"
#: transact.c:67
-#, fuzzy, c-format
+#, c-format
msgid "mapped address %s to local %s\n"
-msgstr "%s をローカルの %s に置換しました。\n"
+msgstr "%s をローカルの %s にマップしました。\n"
#: transact.c:89
#, c-format
@@ -2982,9 +2980,8 @@ msgid "SMTP listener rejected local recipient addresses: "
msgstr "SMTP 受信プログラムが次のアドレスの受信を拒否しました : "
#: transact.c:1445
-#, fuzzy
msgid "error writing message text\n"
-msgstr "メッセージを書き込んでいます\n"
+msgstr "メッセージを書き込む際にエラーが発生しました\n"
#: uid.c:250
#, c-format
@@ -3062,7 +3059,3 @@ msgstr "realloc できませんでした。\n"
#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
#~ msgstr "MDA より SIGPIPE が発信されたか stream socket のエラーです。\n"
-
-#, fuzzy
-#~ msgid "MDA write error.\n"
-#~ msgstr "Deity エラー"
diff --git a/po/pl.po b/po/pl.po
index 388835f2..a8d0562d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.4-rc1\n"
+"Project-Id-Version: fetchmail 6.3.5-b1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
"POT-Creation-Date: 2006-08-15 01:30+0200\n"
-"PO-Revision-Date: 2006-04-06 18:20+0200\n"
+"PO-Revision-Date: 2006-08-24 17:50+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"
@@ -126,9 +126,9 @@ msgid " (%d header octets)"
msgstr " (%d bajtw nagwka)"
#: driver.c:682
-#, fuzzy, c-format
+#, c-format
msgid " (%d body octets)"
-msgstr " (%d bajtw treci) "
+msgstr " (%d bajtw treci)"
#: driver.c:743
#, c-format
@@ -763,14 +763,13 @@ msgid "Enter password for %s@%s: "
msgstr "Podaj haso dla %s@%s: "
#: fetchmail.c:545 fetchmail.c:581
-#, fuzzy
msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
-msgstr "fetchmail: uwaga: brak serwera DNS potrzebnego do sprawdzenia %s\n"
+msgstr ""
+"fetchmail: Uwaga: ustawiono sysloga i plik loga. Logw naley szuka w obu!\n"
#: fetchmail.c:557
-#, fuzzy
msgid "fetchmail: Cannot detach into background. Aborting.\n"
-msgstr "fetchmail: nie dziaa aden inny proces fetchmaila\n"
+msgstr "fetchmail: Nie mona przej w to. Zakoczenie.\n"
#: fetchmail.c:561
#, c-format
@@ -957,9 +956,9 @@ msgstr ""
"konfiguracja dla %s jest bdna - LMTP nie uywa domylnego portu SMTP\n"
#: fetchmail.c:1293
-#, fuzzy
msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr "Jednoczesne fetchall i keep w trybie demona to bd!\n"
+msgstr ""
+"Jednoczesne fetchall i keep w trybie demona lub bezczynnoci to bd!\n"
#: fetchmail.c:1318
#, c-format
@@ -1689,7 +1688,7 @@ msgstr "przejdzie w stan bezczynnoci po odpytaniu\n"
#: imap.c:427 pop3.c:469
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
-msgstr ""
+msgstr "%s: zgodne przejcie na TLS.\n"
#: imap.c:540
msgid "Required OTP capability not compiled into fetchmail\n"
@@ -2105,9 +2104,8 @@ msgstr ""
"serwera.\n"
#: options.c:615
-#, fuzzy
msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
-msgstr " --sslproto wymusza protok ssl (ssl2/ssl3/tls1)\n"
+msgstr " --sslproto wymusza protok ssl (SSL2/SSL3/TLS1)\n"
#: options.c:617
msgid " --plugin specify external command to open connection\n"
@@ -2310,7 +2308,7 @@ msgid "Server responded with UID for wrong message.\n"
msgstr "Serwer odpowiedzia z UID-em dla niewaciwego listu.\n"
#: pop3.c:758 pop3.c:1004
-#, fuzzy, c-format
+#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (num=%d) zosta skasowany, ale nadal istnieje!\n"
@@ -2665,9 +2663,9 @@ msgstr "nie mona podnie procesu suchajcego; powrt do %s"
# XXX
#: sink.c:1341
-#, fuzzy, c-format
+#, c-format
msgid "Error writing to MDA: %s\n"
-msgstr "Bd podczas usuwania %s: %s\n"
+msgstr "Bd podczas pisania do MDA: %s\n"
#: sink.c:1344
#, c-format
@@ -2680,10 +2678,11 @@ msgid "MDA returned nonzero status %d\n"
msgstr "MDA zwrci niezerowy kod bdu %d\n"
#: sink.c:1350
-#, fuzzy, c-format
+#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr "Dziwne: MDA pclose zwrcio %d, nie mona obsuy w %s:%d\n"
+msgstr ""
+"Dziwne: MDA pclose zwrcio %d a errno %d/%s, nie mona obsuy w %s:%d\n"
#: sink.c:1372
msgid "Message termination or close of BSMTP file failed\n"
@@ -2775,34 +2774,32 @@ msgid "Try adding the --service option (see also FAQ item R12).\n"
msgstr "Prosz sprbowa doda opcj --service (p. take punkt R12 FAQ).\n"
#: socket.c:296 socket.c:299
-#, fuzzy, c-format
+#, c-format
msgid "unknown (%s)"
-msgstr "nieznany"
+msgstr "nieznany (%s)"
#: socket.c:302
#, c-format
msgid "Trying to connect to %s/%s..."
-msgstr ""
+msgstr "Prba poczenia z %s/%s..."
#: socket.c:310
-#, fuzzy, c-format
+#, c-format
msgid "cannot create socket: %s\n"
-msgstr "nie mog wysa poczty nawet do %s!\n"
+msgstr "nie mona utworzy gniazda: %s\n"
#: socket.c:326
-#, fuzzy
msgid "connection failed.\n"
-msgstr "poczenie SSL nie powiodo si.\n"
+msgstr "poczenie nie powiodo si.\n"
#: socket.c:328
-#, fuzzy, c-format
+#, c-format
msgid "connection to %s:%s [%s/%s] failed: %s.\n"
-msgstr "poczenie %s z %s nie powiodo si"
+msgstr "poczenie z %s:%s [%s/%s] nie powiodo si: %s.\n"
#: socket.c:334
-#, fuzzy
msgid "connected.\n"
-msgstr "poczenie SSL nie powiodo si.\n"
+msgstr "poczono.\n"
#: socket.c:662
#, c-format
@@ -2915,9 +2912,9 @@ msgid "Cygwin socket read retry failed!\n"
msgstr "Powtrzenie odczytu z gniazda cygwinowego nie powiodo si!\n"
#: transact.c:67
-#, fuzzy, c-format
+#, c-format
msgid "mapped address %s to local %s\n"
-msgstr "%s zamieniony na lokalny %s\n"
+msgstr "adres %s zamieniony na lokalny %s\n"
#: transact.c:89
#, c-format
@@ -3001,9 +2998,8 @@ msgid "SMTP listener rejected local recipient addresses: "
msgstr "demon SMTP odrzuci adresy lokalnych odbiorcw: '"
#: transact.c:1445
-#, fuzzy
msgid "error writing message text\n"
-msgstr "zapisuj tre listu\n"
+msgstr "bd podczas zapisu treci listu\n"
#: uid.c:250
#, c-format
@@ -3077,10 +3073,3 @@ msgstr "bd malloc\n"
#: xmalloc.c:47
msgid "realloc failed\n"
msgstr "bd realloc\n"
-
-#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
-#~ msgstr "SIGPIPE otrzymany od MDA lub bd gniazda strumienia\n"
-
-#, fuzzy
-#~ msgid "MDA write error.\n"
-#~ msgstr "Bd boskoci"
diff --git a/po/ru.po b/po/ru.po
index aa8ab75d..bc6528bb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,4 +1,4 @@
-# Translation of fetchmail-6.3.4.po to Russian
+# Translation of fetchmail-6.3.5-b1.po to Russian
# Copyright (C) 2005 Eric S. Raymond
# This file is distributed under the same license as the fetchmail package.
#
@@ -6,16 +6,16 @@
# Pavel Maryanov <acid_jack@ukr.net>, 2003, 2005, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail-6.3.4\n"
+"Project-Id-Version: fetchmail-6.3.5-b1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
"POT-Creation-Date: 2006-08-15 01:30+0200\n"
-"PO-Revision-Date: 2006-04-25 18:09+0300\n"
+"PO-Revision-Date: 2006-08-26 18:57+0300\n"
"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=KOI8-R\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.1\n"
+"X-Generator: KBabel 1.11.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: checkalias.c:174
@@ -128,9 +128,9 @@ msgid " (%d header octets)"
msgstr " (%d )"
#: driver.c:682
-#, fuzzy, c-format
+#, c-format
msgid " (%d body octets)"
-msgstr " (%d ) "
+msgstr " (%d )"
#: driver.c:743
#, c-format
@@ -771,16 +771,14 @@ msgid "Enter password for %s@%s: "
msgstr " %s@%s: "
#: fetchmail.c:545 fetchmail.c:581
-#, fuzzy
msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
msgstr ""
-"fetchmail: : DNS "
-" %s\n"
+"fetchmail: : syslog logfile. "
+" !\n"
#: fetchmail.c:557
-#, fuzzy
msgid "fetchmail: Cannot detach into background. Aborting.\n"
-msgstr "fetchmail: fetchmail \n"
+msgstr "fetchmail: . .\n"
#: fetchmail.c:561
#, c-format
@@ -790,7 +788,7 @@ msgstr " fetchmail %s\n"
#: fetchmail.c:577 fetchmail.c:579
#, c-format
msgid "could not open %s to append logs to \n"
-msgstr " %s \n"
+msgstr " %s \n"
#: fetchmail.c:618
#, c-format
@@ -800,7 +798,7 @@ msgstr " %s ( %d)\n"
#: fetchmail.c:623
#, c-format
msgid "restarting fetchmail (%s changed)\n"
-msgstr " fetchmail (%s )\n"
+msgstr "fetchmail (%s )\n"
#: fetchmail.c:628
msgid "attempt to re-exec may fail as directory has not been restored\n"
@@ -973,9 +971,10 @@ msgstr ""
" %s , LMTP SMTP \n"
#: fetchmail.c:1293
-#, fuzzy
msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
-msgstr " fetchall, , !\n"
+msgstr ""
+" fetchall, , "
+"!\n"
#: fetchmail.c:1318
#, c-format
@@ -1683,15 +1682,15 @@ msgstr " \n"
#: imap.c:427 pop3.c:469
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
-msgstr ""
+msgstr "%s: TLS.\n"
#: imap.c:540
msgid "Required OTP capability not compiled into fetchmail\n"
-msgstr "Fetchmail OTP\n"
+msgstr "Fetchmail OTP\n"
#: imap.c:562 pop3.c:372
msgid "Required NTLM capability not compiled into fetchmail\n"
-msgstr "Fetchmail NTLM\n"
+msgstr "Fetchmail NTLM\n"
#: imap.c:571
msgid "Required LOGIN capability not supported by server\n"
@@ -1700,7 +1699,7 @@ msgstr " LOGIN \n"
#: imap.c:645
#, c-format
msgid "mail expunge mismatch (%d actual != %d expected)\n"
-msgstr " (%d != %d )\n"
+msgstr " (%d != %d )\n"
#: imap.c:749 imap.c:808
msgid "re-poll failed\n"
@@ -2096,11 +2095,10 @@ msgstr ""
".\n"
#: options.c:615
-#, fuzzy
msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
msgstr ""
-" --sslproto ssl (ssl2/ssl3/"
-"tls1)\n"
+" --sslproto ssl (SSL2/SSL3/"
+"TLS1)\n"
#: options.c:617
msgid " --plugin specify external command to open connection\n"
@@ -2299,7 +2297,7 @@ msgid "Server responded with UID for wrong message.\n"
msgstr " UID .\n"
#: pop3.c:758 pop3.c:1004
-#, fuzzy, c-format
+#, c-format
msgid "id=%s (num=%d) was deleted, but is still present!\n"
msgstr "id=%s (=%d) , !\n"
@@ -2387,7 +2385,7 @@ msgstr " %s"
#: rfc822.c:212
#, c-format
msgid "Rewritten version is %s\n"
-msgstr " %s\n"
+msgstr " %s\n"
#: rpa.c:117
msgid "Success"
@@ -2651,9 +2649,9 @@ msgid "can't raise the listener; falling back to %s"
msgstr " ; %s"
#: sink.c:1341
-#, fuzzy, c-format
+#, c-format
msgid "Error writing to MDA: %s\n"
-msgstr " %s: %s\n"
+msgstr " MDA: %s\n"
#: sink.c:1344
#, c-format
@@ -2666,14 +2664,16 @@ msgid "MDA returned nonzero status %d\n"
msgstr "MDA %d\n"
#: sink.c:1350
-#, fuzzy, c-format
+#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr ": MDA pclose %d, %s:%d\n"
+msgstr ""
+": MDA pclose %d %d/%s, "
+" %s:%d\n"
#: sink.c:1372
msgid "Message termination or close of BSMTP file failed\n"
-msgstr " BSMTP \n"
+msgstr " BSMTP\n"
#: sink.c:1394
msgid "SMTP listener refused delivery\n"
@@ -2761,34 +2761,32 @@ msgid "Try adding the --service option (see also FAQ item R12).\n"
msgstr " --service (. FAQ, R12).\n"
#: socket.c:296 socket.c:299
-#, fuzzy, c-format
+#, c-format
msgid "unknown (%s)"
-msgstr "."
+msgstr ". (%s)"
#: socket.c:302
#, c-format
msgid "Trying to connect to %s/%s..."
-msgstr ""
+msgstr " %s/%s..."
#: socket.c:310
-#, fuzzy, c-format
+#, c-format
msgid "cannot create socket: %s\n"
-msgstr " %s!\n"
+msgstr " : %s\n"
#: socket.c:326
-#, fuzzy
msgid "connection failed.\n"
-msgstr " SSL .\n"
+msgstr " .\n"
#: socket.c:328
-#, fuzzy, c-format
+#, c-format
msgid "connection to %s:%s [%s/%s] failed: %s.\n"
-msgstr "%s- %s "
+msgstr " %s:%s [%s/%s] : %s.\n"
#: socket.c:334
-#, fuzzy
msgid "connected.\n"
-msgstr " SSL .\n"
+msgstr " .\n"
#: socket.c:662
#, c-format
@@ -2906,9 +2904,9 @@ msgid "Cygwin socket read retry failed!\n"
msgstr " Cygwin !\n"
#: transact.c:67
-#, fuzzy, c-format
+#, c-format
msgid "mapped address %s to local %s\n"
-msgstr " %s %s\n"
+msgstr " %s %s\n"
#: transact.c:89
#, c-format
@@ -2992,9 +2990,8 @@ msgid "SMTP listener rejected local recipient addresses: "
msgstr " SMTP : "
#: transact.c:1445
-#, fuzzy
msgid "error writing message text\n"
-msgstr " \n"
+msgstr " \n"
#: uid.c:250
#, c-format
@@ -3069,7 +3066,3 @@ msgstr "realloc \n"
#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
#~ msgstr " MDA SIGPIPE \n"
-
-#, fuzzy
-#~ msgid "MDA write error.\n"
-#~ msgstr " "
diff --git a/po/vi.po b/po/vi.po
index e78dc65f..4a44a7e1 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,20 +1,19 @@
# Vietnamese translation for Fetchmail.
-# Copyright © 2006 Eric S. Raymond
-# Clytie Siddall <clytie@riverland.net.au>, 2006.
+# Copyright © 2006 Clytie Siddall <clytie@riverland.net.au>
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.4\n"
+"Project-Id-Version: fetchmail 6.3.5-b1\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
"POT-Creation-Date: 2006-08-15 01:30+0200\n"
-"PO-Revision-Date: 2006-07-12 18:06+0930\n"
+"PO-Revision-Date: 2006-08-26 16:01+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: LocFactoryEditor 1.6b36\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.6fc1\n"
#: checkalias.c:174
#, c-format
@@ -124,9 +123,9 @@ msgid " (%d header octets)"
msgstr " (%d octet dòng đầu)"
#: driver.c:682
-#, fuzzy, c-format
+#, c-format
msgid " (%d body octets)"
-msgstr " (%d octet thân) "
+msgstr " (%d octet thân)"
#: driver.c:743
#, c-format
@@ -744,16 +743,14 @@ msgid "Enter password for %s@%s: "
msgstr "Hãy gõ mật khẩu cho %s@%s: "
#: fetchmail.c:545 fetchmail.c:581
-#, fuzzy
msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n"
msgstr ""
-"fetchmail: cảnh báo : không có DNS sẵn sàng để kiểm tra việc lấy đa thả từ %"
-"s\n"
+"fetchmail: cảnh báo : cả syslog (bản ghi hệ thống) lẫn logfile (tập tin ghi "
+"lưu) đều đã được đặt. Hãy kiểm tra cả hai tìm tập tin ghi lưu.\n"
#: fetchmail.c:557
-#, fuzzy
msgid "fetchmail: Cannot detach into background. Aborting.\n"
-msgstr "fetchmail: không có thẻ hiện fetchmail khác đang chạy\n"
+msgstr "fetchmail: không thể tháo bỏ vào nền nên hủy bỏ.\n"
#: fetchmail.c:561
#, c-format
@@ -943,11 +940,10 @@ msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
msgstr "cấu hình %s không hợp lệ; LMTP không thể sử dụng cổng SMTP mặc định\n"
#: fetchmail.c:1293
-#, fuzzy
msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
msgstr ""
-"Việc chạy fetchall (lấy hết) và tiếp tục trong chế độ trình nền là trường "
-"hợp xấu.\n"
+"Việc chạy fetchall (lấy hết) cùng với tiếp tục trong chế độ trình nền là "
+"trường hợp xấu.\n"
#: fetchmail.c:1318
#, c-format
@@ -1658,7 +1654,7 @@ msgstr "sẽ nghỉ sau khi thăm dò\n"
#: imap.c:427 pop3.c:469
#, c-format
msgid "%s: opportunistic upgrade to TLS.\n"
-msgstr ""
+msgstr "%s: nâng cấp lên TLS một cách cơ hội chủ nghĩa.\n"
#: imap.c:540
msgid "Required OTP capability not compiled into fetchmail\n"
@@ -2077,9 +2073,8 @@ msgstr ""
"\t\t\t\t\t\tcủa máy phục vụ\n"
#: options.c:615
-#, fuzzy
msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
-msgstr " --sslproto buộc dùng _giao thức SSL_ (ssl2/ssl3/tls1)\n"
+msgstr " --sslproto buộc dùng _giao thức SSL_ (SSL2/SSL3/TLS1)\n"
#: options.c:617
msgid " --plugin specify external command to open connection\n"
@@ -2634,9 +2629,9 @@ msgid "can't raise the listener; falling back to %s"
msgstr "không thể liên lạc với bộ lắng nghe nên dự trữ về %s"
#: sink.c:1341
-#, fuzzy, c-format
+#, c-format
msgid "Error writing to MDA: %s\n"
-msgstr "Gặp lỗi khi xoá bỏ %s: %s\n"
+msgstr "Gặp lỗi khi ghi vào MDA: %s\n"
#: sink.c:1344
#, c-format
@@ -2649,10 +2644,12 @@ msgid "MDA returned nonzero status %d\n"
msgstr "MDA đã trả về trạng thái không phải số không %d\n"
#: sink.c:1350
-#, fuzzy, c-format
+#, c-format
msgid ""
"Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"
-msgstr "Lạ : việc pclose MDA đã trả về %d nên không thể xử lý tại %s:%d\n"
+msgstr ""
+"Lạ : việc pclose MDA đã trả lại %d và số hiệu lỗi %d/%s nên không thể xử lý "
+"tại %s:%d\n"
#: sink.c:1372
msgid "Message termination or close of BSMTP file failed\n"
@@ -2746,34 +2743,32 @@ msgstr ""
"R12).\n"
#: socket.c:296 socket.c:299
-#, fuzzy, c-format
+#, c-format
msgid "unknown (%s)"
-msgstr "không rõ"
+msgstr "không rõ (%s)"
#: socket.c:302
#, c-format
msgid "Trying to connect to %s/%s..."
-msgstr ""
+msgstr "Đang thử kết nối đến %s/%s..."
#: socket.c:310
-#, fuzzy, c-format
+#, c-format
msgid "cannot create socket: %s\n"
-msgstr "không thể gởi ngay cả cho %s.\n"
+msgstr "không thể tạo ổ cắm: %s.\n"
#: socket.c:326
-#, fuzzy
msgid "connection failed.\n"
-msgstr "Kết nối SSL đã thất bại.\n"
+msgstr "lỗi kết nối.\n"
#: socket.c:328
-#, fuzzy, c-format
+#, c-format
msgid "connection to %s:%s [%s/%s] failed: %s.\n"
-msgstr "kết nối %s đến %s bị lỗi"
+msgstr "lỗi kết nối đến %s:%s [%s/%s]: %s.\n"
#: socket.c:334
-#, fuzzy
msgid "connected.\n"
-msgstr "Kết nối SSL đã thất bại.\n"
+msgstr "đã kết nối.\n"
#: socket.c:662
#, c-format
@@ -2887,9 +2882,9 @@ msgid "Cygwin socket read retry failed!\n"
msgstr "Việc cố lại đọc ổ cắm Cygwin bị lỗi.\n"
#: transact.c:67
-#, fuzzy, c-format
+#, c-format
msgid "mapped address %s to local %s\n"
-msgstr "đã ảnh xạ %s thành %s cục bộ\n"
+msgstr "đã ảnh xạ địa chỉ %s thành %s cục bộ\n"
#: transact.c:89
#, c-format
@@ -2973,9 +2968,8 @@ msgid "SMTP listener rejected local recipient addresses: "
msgstr "Bộ lắng nghe SMTP đã từ chối các địa chỉ người nhận cục bộ : "
#: transact.c:1445
-#, fuzzy
msgid "error writing message text\n"
-msgstr "đang ghi thân thư...\n"
+msgstr "gặp lỗi khi ghi thân thư\n"
#: uid.c:250
#, c-format
@@ -3048,10 +3042,3 @@ msgstr "malloc (phân chia bộ nhớ) bị lỗi\n"
#: xmalloc.c:47
msgid "realloc failed\n"
msgstr "realloc (phân chia lại bộ nhớ) bị lỗi\n"
-
-#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
-#~ msgstr "nhận SIGPIPE từ MDA hay lỗi ổ cắm luồng\n"
-
-#, fuzzy
-#~ msgid "MDA write error.\n"
-#~ msgstr "Lỗi deity"