aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2008-11-12 00:22:16 +0000
committerMatthias Andree <matthias.andree@gmx.de>2008-11-12 00:22:16 +0000
commit60513c9658c230d28914df59e822fcac5a84aabc (patch)
tree7f59f52e8b44f15439097d57aebcecb0682d21f0
parenta0c683cc556370fa928b0965d613d0eb51f1e368 (diff)
downloadfetchmail-60513c9658c230d28914df59e822fcac5a84aabc.tar.gz
fetchmail-60513c9658c230d28914df59e822fcac5a84aabc.tar.bz2
fetchmail-60513c9658c230d28914df59e822fcac5a84aabc.zip
Import new translations from translation project.
svn path=/branches/BRANCH_6-3/; revision=5236
-rw-r--r--po/ca.po14
-rw-r--r--po/cs.po18
-rw-r--r--po/de.po6
-rw-r--r--po/el.po117
-rw-r--r--po/ja.po27
-rw-r--r--po/pl.po21
-rw-r--r--po/sk.po33
-rw-r--r--po/zh_CN.po167
8 files changed, 201 insertions, 202 deletions
diff --git a/po/ca.po b/po/ca.po
index 5bb04cd6..7a471382 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -643,7 +643,7 @@ msgid ""
"Copyright (C) 2005 - 2008 Matthias Andree\n"
msgstr ""
"Copyright (C) 2002, 2003 Eric S. Raymond\n"
-"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
+"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Rob F. Funk, Graham "
"Wilson\n"
"Copyright (C) 2005-2006 Matthias Andree, Sunil Shetye\n"
@@ -2431,9 +2431,9 @@ msgid "File %s must be a regular file.\n"
msgstr "El fitxer %s ha de ser un fitxer ordinari.\n"
#: rcfile_y.y:431
-#, c-format
+#, fuzzy, c-format
msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
-msgstr "El fitxer %s no pot tenir permisos més que -rwx------ (0700).\n"
+msgstr "El fitxer %s no pot tenir permisos més que -rwx--x--- (0710).\n"
#: rcfile_y.y:443
#, c-format
@@ -3146,11 +3146,3 @@ msgstr "la rutina malloc ha fallat\n"
#: xmalloc.c:47
msgid "realloc failed\n"
msgstr "la rutina realloc ha fallat\n"
-
-#, fuzzy
-#~ msgid "negative size for body: message %s@%s:%d (%d octets)\n"
-#~ msgstr "ometent el missatge %s@%s:%d (%d octets)"
-
-#, fuzzy
-#~ msgid "TLS connection failed.\n"
-#~ msgstr "La conexió SSL ha fallat.\n"
diff --git a/po/cs.po b/po/cs.po
index 5d02796c..17c5462a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,10 +7,10 @@
# Petr Pisar <petr.pisar@atlas.cz>, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.8\n"
+"Project-Id-Version: fetchmail 6.3.9-rc3\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
"POT-Creation-Date: 2008-06-30 15:43+0200\n"
-"PO-Revision-Date: 2008-09-23 16:56+0200\n"
+"PO-Revision-Date: 2008-11-05 11:32+0100\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -635,7 +635,6 @@ msgid "Option --check is not supported with ETRN\n"
msgstr "Přepína� --check není s ETRN podporován.\n"
#: fetchmail.c:137
-#, fuzzy
msgid ""
"Copyright (C) 2002, 2003 Eric S. Raymond\n"
"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
@@ -647,7 +646,7 @@ msgstr ""
"Copyright © 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
"Wilson\n"
"Copyright © 2005–2006 Sunil Shetye\n"
-"Copyright © 2005–2007 Matthias Andree\n"
+"Copyright © 2005–2008 Matthias Andree\n"
#: fetchmail.c:142
msgid ""
@@ -785,7 +784,7 @@ msgstr "nemohu otevřít %s, kam připojovat záznamy \n"
#: fetchmail.c:612
msgid "--check mode enabled, not fetching mail\n"
-msgstr ""
+msgstr "režim --check zapnut, poštu nestahuji\n"
#: fetchmail.c:634
#, c-format
@@ -1200,9 +1199,9 @@ msgid " SSL trusted certificate directory: %s\n"
msgstr " Adresář důvěryhodných certifikátů SSL: %s\n"
#: fetchmail.c:1642
-#, fuzzy, c-format
+#, c-format
msgid " SSL server CommonName: %s\n"
-msgstr "Jméno serveru: %s\n"
+msgstr " CommonName SSL serveru: %s\n"
#: fetchmail.c:1644
#, c-format
@@ -2108,6 +2107,7 @@ msgstr " --sslcertpath cesta k certifikátům ssl\n"
msgid ""
" --sslcommonname expect this CommonName from server (discouraged)\n"
msgstr ""
+" --sslcommonname od serveru o�ekávat tento CommonName (nedoporu�eno)\n"
#: options.c:621
msgid ""
@@ -2390,9 +2390,9 @@ msgid "File %s must be a regular file.\n"
msgstr "Soubor %s musí být oby�ejný soubor.\n"
#: rcfile_y.y:431
-#, fuzzy, c-format
+#, c-format
msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
-msgstr "Soubor %s nesmí mít oprávnění více než -rwx--x--- (0710).\n"
+msgstr "Soubor %s nesmí mít více oprávnění než -rwx------ (0700).\n"
#: rcfile_y.y:443
#, c-format
diff --git a/po/de.po b/po/de.po
index ecad2019..9da14c29 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,11 +6,11 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: de\n"
+"Project-Id-Version: fetchmail 6.3.9-rc3\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
"POT-Creation-Date: 2008-06-30 15:43+0200\n"
-"PO-Revision-Date: 2008-11-04 15:18+0100\n"
-"Last-Translator: Matthias Andree <matthias.andree>\n"
+"PO-Revision-Date: 2008-11-12 01:17+0100\n"
+"Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
"Language-Team: Deutsch <de@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/el.po b/po/el.po
index 551daa10..a220ef43 100644
--- a/po/el.po
+++ b/po/el.po
@@ -68,17 +68,13 @@ msgstr ""
#, fuzzy, c-format
msgid "The following oversized messages were deleted on server %s account %s:"
msgstr ""
-"Subject: Ðñïåéäïðïßçóç fetchmail õðåñìåãÝèïõò-ìçíõìÜôùí.\n"
-"\n"
-"Ôá áêüëïõèá õðåñâïëéêïý ìåãÝèïõò ìçíýìáôá ðáñáìÝíïõí óôï äéá÷åéñéóôÞ %s:"
+"óå üñéï ëÞøçò %d; %d ìçíýìáôá Ýìåéíáí óôïí äéá÷åéñéóôÞ %s ëïãáñéáóìü%s\n"
#: driver.c:343
#, fuzzy, c-format
msgid "The following oversized messages remain on server %s account %s:"
msgstr ""
-"Subject: Ðñïåéäïðïßçóç fetchmail õðåñìåãÝèïõò-ìçíõìÜôùí.\n"
-"\n"
-"Ôá áêüëïõèá õðåñâïëéêïý ìåãÝèïõò ìçíýìáôá ðáñáìÝíïõí óôï äéá÷åéñéóôÞ %s:"
+"óå üñéï ëÞøçò %d; %d ìçíýìáôá Ýìåéíáí óôïí äéá÷åéñéóôÞ %s ëïãáñéáóìü%s\n"
#: driver.c:362
#, fuzzy, c-format
@@ -2438,9 +2434,9 @@ msgid "File %s must be a regular file.\n"
msgstr "Ôï áñ÷åßï %s ðñÝðåé íá åßíáé êáíïíéêü áñ÷åßï.\n"
#: rcfile_y.y:431
-#, c-format
+#, fuzzy, c-format
msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
-msgstr "Ôï áñ÷åßï %s äå ðñÝðåé íá Ý÷åé ðÜíù áðü -rwx------ (0700) Üäåéåò.\n"
+msgstr "Ôï áñ÷åßï %s äå ðñÝðåé íá Ý÷åé ðÜíù áðü -rwx--x--- (0710) Üäåéåò.\n"
#: rcfile_y.y:443
#, c-format
@@ -2736,7 +2732,7 @@ msgstr "áäõíáìßá áíýøùóçò áêñïáôÞ· ÷ñÞóç ôïõ %s"
#: sink.c:1346
#, fuzzy, c-format
msgid "Error writing to MDA: %s\n"
-msgstr "ÓöÜëìá óôçí áðåëåõèÝñùóç äéáðéóôåõôçñßùí\n"
+msgstr "ðñïùèåßôáé óôï %s\n"
#: sink.c:1349
#, c-format
@@ -2845,9 +2841,9 @@ msgid "Try adding the --service option (see also FAQ item R12).\n"
msgstr ""
#: socket.c:296 socket.c:299
-#, fuzzy, c-format
+#, c-format
msgid "unknown (%s)"
-msgstr "Üãíùóôïò äéáêïìéóôÞò."
+msgstr ""
#: socket.c:302
#, c-format
@@ -3092,7 +3088,7 @@ msgstr "Ðñü÷åéñç ëßóôá ìå UID:"
#: uid.c:517 uid.c:569
#, fuzzy, c-format
msgid "Merged UID list from %s:"
-msgstr "ÐáëéÜ ëßóôá UID áðü %s:"
+msgstr "ÍÝá ëßóôá UID áðü %s:"
#: uid.c:519
#, c-format
@@ -3148,6 +3144,18 @@ msgstr "áðÝôõ÷å ôï malloc\n"
msgid "realloc failed\n"
msgstr "áðÝôõ÷å ôï realloc\n"
+#~ msgid ""
+#~ "Subject: Fetchmail oversized-messages warning.\n"
+#~ "\n"
+#~ "The following oversized messages remain on the mail server %s:"
+#~ msgstr ""
+#~ "Subject: Ðñïåéäïðïßçóç fetchmail õðåñìåãÝèïõò-ìçíõìÜôùí.\n"
+#~ "\n"
+#~ "Ôá áêüëïõèá õðåñâïëéêïý ìåãÝèïõò ìçíýìáôá ðáñáìÝíïõí óôï äéá÷åéñéóôÞ %s:"
+
+#~ msgid "header "
+#~ msgstr "åðéêåöáëßäáò "
+
#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
#~ msgstr "Ýíá SIGPIPE ðåôÜ÷ôçêå áðü Ýíá MDA Þ áðü óöÜëìá stream socket\n"
@@ -3166,6 +3174,12 @@ msgstr "áðÝôõ÷å ôï realloc\n"
#~ msgid "unknown DNS error %d."
#~ msgstr "Üãíùóôï óöÜëìá DNS %d."
+#~ msgid "messages"
+#~ msgstr "ìçíýìáôá"
+
+#~ msgid "message"
+#~ msgstr "ìÞíõìá"
+
#~ msgid "Option --remote is not supported with ETRN\n"
#~ msgstr "Ç åðéëïãÞ --remote äåí õðïóôçñßæåôå ìå ôï ETRN\n"
@@ -3175,12 +3189,42 @@ msgstr "áðÝôõ÷å ôï realloc\n"
#~ msgid "Cannot support ODMR without gethostbyname(2).\n"
#~ msgstr "Áäõíáìßá õðïóôÞñéîçò ODMR ÷ùñßò gethostbyname(2).\n"
+#~ msgid "will not"
+#~ msgstr "'äåí èá"
+
+#~ msgid "will"
+#~ msgstr "èá"
+
#~ msgid " (using network security options %s)"
#~ msgstr " (÷ñÞóç åðéëïãþí áóöÜëåéáò äéêôýïõ %s)"
#~ msgid " (using port %d)"
#~ msgstr " (÷ñçóéìïðïßçóç èýñáò %d)"
+#~ msgid "All"
+#~ msgstr "¼ëá"
+
+#~ msgid "Only new"
+#~ msgstr "Ìüíï ôá íÝá"
+
+#~ msgid "enabled"
+#~ msgstr "óå ëåéôïõñãßá"
+
+#~ msgid "disabled"
+#~ msgstr "åêôüò ëåéôïõñãßáò"
+
+#~ msgid "discarded"
+#~ msgstr "áðïññéöèïýí"
+
+#~ msgid "kept"
+#~ msgstr "êñáôçèïýí"
+
+#~ msgid "IP address.\n"
+#~ msgstr "äéåýèõíóç IP.\n"
+
+#~ msgid "name.\n"
+#~ msgstr "üíïìá.\n"
+
#~ msgid "Received"
#~ msgstr "ÐáñáëÞöèçêå"
@@ -3205,57 +3249,14 @@ msgstr "áðÝôõ÷å ôï realloc\n"
#~ msgid "network-security support disabled"
#~ msgstr "áðåíåñãïðïéÞèçêå ç õðïóôÞñéîç áóöÜëåéá-äéêôýïõ"
+#~ msgid "partial error message buffer overflow"
+#~ msgstr "ìåñéêü óöÜëìá êáôÜôìçóçò ìçíýìáôïò ëÜèïõò"
+
#~ msgid "fetchmail: getaddrinfo(%s.%s)\n"
#~ msgstr "fetchmail: getaddrinfo(%s.%s)\n"
#~ msgid "fetchmail: illegal address length received for host %s\n"
#~ msgstr "fetchmail: ëÞøç ðáñÜíïìïõ ìÞêïõò äéåýèõíóçò ãéá ôï äéáêïìéóôÞ %s\n"
-#~ msgid "header "
-#~ msgstr "åðéêåöáëßäáò "
-
-#~ msgid "will not"
-#~ msgstr "'äåí èá"
-
-#~ msgid "will"
-#~ msgstr "èá"
-
-#~ msgid "All"
-#~ msgstr "¼ëá"
-
-#~ msgid "Only new"
-#~ msgstr "Ìüíï ôá íÝá"
-
-#~ msgid "enabled"
-#~ msgstr "óå ëåéôïõñãßá"
-
-#~ msgid "disabled"
-#~ msgstr "åêôüò ëåéôïõñãßáò"
-
-#~ msgid "discarded"
-#~ msgstr "áðïññéöèïýí"
-
-#~ msgid "kept"
-#~ msgstr "êñáôçèïýí"
-
-#~ msgid "IP address.\n"
-#~ msgstr "äéåýèõíóç IP.\n"
-
-#~ msgid "name.\n"
-#~ msgstr "üíïìá.\n"
-
#~ msgid "lstat: %s: %s\n"
#~ msgstr "lstat: %s: %s\n"
-
-#~ msgid "partial error message buffer overflow"
-#~ msgstr "ìåñéêü óöÜëìá êáôÜôìçóçò ìçíýìáôïò ëÜèïõò"
-
-#, fuzzy
-#~ msgid "alloca failed\n"
-#~ msgstr "alloca áðÝôõ÷å"
-
-#~ msgid "messages"
-#~ msgstr "ìçíýìáôá"
-
-#~ msgid "message"
-#~ msgstr "ìÞíõìá"
diff --git a/po/ja.po b/po/ja.po
index 18059599..bb700642 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,16 +1,17 @@
# Japanese messages for fetchmail.
# Copyright (C) 2005-2006 Eric S. Raymond
# Copyright (C) 2002 Free Software Foundation, Inc.
-# Takeshi Hamasaki <hma@syd.odn.ne.jp>, 2005-2007
+# This file is distributed under the same license as the fetchmail package.
+# Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>, 2005-2008
# based on the work by Jumpei Baba <jbaba@wb3.so-net.ne.jp>, 2002
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.8\n"
+"Project-Id-Version: fetchmail 6.3.9-rc3\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
"POT-Creation-Date: 2008-06-30 15:43+0200\n"
-"PO-Revision-Date: 2007-04-28 20:54+0900\n"
-"Last-Translator: Takeshi Hamasaki <hma@syd.odn.ne.jp>\n"
+"PO-Revision-Date: 2008-11-08 16:32+0900\n"
+"Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -640,7 +641,6 @@ msgid "Option --check is not supported with ETRN\n"
msgstr "オプション --check � ETRN ���時�利用����ん。\n"
#: fetchmail.c:137
-#, fuzzy
msgid ""
"Copyright (C) 2002, 2003 Eric S. Raymond\n"
"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
@@ -651,8 +651,8 @@ msgstr ""
"Copyright (C) 2002, 2003 Eric S. Raymond\n"
"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
"Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
#: fetchmail.c:142
msgid ""
@@ -666,7 +666,7 @@ msgstr ""
#: fetchmail.c:176
msgid "WARNING: Running as root is discouraged.\n"
-msgstr "警告: root アカウント��実行��薦�����ん。\n"
+msgstr "警告: root アカウント��実行��勧�����ん。\n"
#: fetchmail.c:188
msgid "fetchmail: invoked with"
@@ -793,7 +793,7 @@ msgstr "ログを追加ã�™ã‚‹ã�Ÿã‚�ã�« %s ã‚’é–‹ã��ã�“ã�¨ã�Œå‡ºæ�¥ã�¾ã�›ã‚“ã�§ã�
#: fetchmail.c:612
msgid "--check mode enabled, not fetching mail\n"
-msgstr ""
+msgstr "--check モード�有効����メールを�り込���ん\n"
#: fetchmail.c:634
#, c-format
@@ -1214,9 +1214,9 @@ msgid " SSL trusted certificate directory: %s\n"
msgstr " SSL 信用�能証明書� %s �格��れ����。\n"
#: fetchmail.c:1642
-#, fuzzy, c-format
+#, c-format
msgid " SSL server CommonName: %s\n"
-msgstr "サー�� CommonName: %s\n"
+msgstr " SSLサー�� CommonName: %s\n"
#: fetchmail.c:1644
#, c-format
@@ -2110,6 +2110,8 @@ msgstr " --sslcertpath SSL ã�® client certificate ファイルを指定ã�—ã
msgid ""
" --sslcommonname expect this CommonName from server (discouraged)\n"
msgstr ""
+" --sslcommonname サー�� CommonName ��れ��る�仮定���(�勧��"
+"���ん)\n"
#: options.c:621
msgid ""
@@ -2408,7 +2410,8 @@ msgstr ""
#: rcfile_y.y:431
#, c-format
msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
-msgstr "%s � -rwx------ (0700) 以外�パーミッション���������ん。\n"
+msgstr ""
+"ファイル %s �パーミッション� -rwx------ (0700) ��������ん。\n"
#: rcfile_y.y:443
#, c-format
diff --git a/po/pl.po b/po/pl.po
index fd6be64c..af2f4c70 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,15 +1,16 @@
# Polish translation for fetchmail.
-# Copyright (C) 1998, 2002, 2003, 2005 Eric S. Raymond
+# Copyright (C) 1998, 2002, 2003, 2005 Eric S. Raymond (msgids)
+# This file is distributed under the same license as the fetchmail package.
# Pawe³ Krawczyk <kravietz@ceti.pl>, 1998-1999.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2002-2007.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2002-2008.
# Thanks for few updates to Adam Go³êbiowski, 2003.
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.8\n"
+"Project-Id-Version: fetchmail 6.3.9-rc3\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
"POT-Creation-Date: 2008-06-30 15:43+0200\n"
-"PO-Revision-Date: 2007-04-27 17:28+0200\n"
+"PO-Revision-Date: 2008-11-05 16:48+0100\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"
@@ -639,7 +640,6 @@ msgid "Option --check is not supported with ETRN\n"
msgstr "Opcja --check nie dzia³a z ETRN\n"
#: fetchmail.c:137
-#, fuzzy
msgid ""
"Copyright (C) 2002, 2003 Eric S. Raymond\n"
"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
@@ -650,8 +650,8 @@ msgstr ""
"Copyright (C) 2002, 2003 Eric S. Raymond\n"
"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
"Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
#: fetchmail.c:142
msgid ""
@@ -792,7 +792,7 @@ msgstr "nie mo¿na otworzyæ %s w celu do³±czania logów \n"
#: fetchmail.c:612
msgid "--check mode enabled, not fetching mail\n"
-msgstr ""
+msgstr "tryb --check w³±czony, nie pobieranie poczty\n"
#: fetchmail.c:634
#, c-format
@@ -1210,9 +1210,9 @@ msgid " SSL trusted certificate directory: %s\n"
msgstr " Katalog zaufanego certyfikatu SSL: %s\n"
#: fetchmail.c:1642
-#, fuzzy, c-format
+#, c-format
msgid " SSL server CommonName: %s\n"
-msgstr "CommonName serwera: %s\n"
+msgstr " CommonName serwera SSL: %s\n"
#: fetchmail.c:1644
#, c-format
@@ -2141,6 +2141,7 @@ msgstr " --sslcertpath ¶cie¿ka do certyfikatów ssl\n"
msgid ""
" --sslcommonname expect this CommonName from server (discouraged)\n"
msgstr ""
+" --sslcommonname oczekiwanie od serwera tego CommonName (niezalecane)\n"
#: options.c:621
msgid ""
diff --git a/po/sk.po b/po/sk.po
index de1df4cd..4d44380a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -64,18 +64,12 @@ msgstr ""
#: driver.c:339
#, fuzzy, c-format
msgid "The following oversized messages were deleted on server %s account %s:"
-msgstr ""
-"Predmet: Fetchmail-varovanie: nadrozmerná správa.\n"
-"\n"
-"Nasledujúca nadrozmerná správa zostáva na po¹tovom serveri %s:"
+msgstr "fetchlimit %d dosiahnutý; %d správ ponecháných na serveri %s úèet %s\n"
#: driver.c:343
#, fuzzy, c-format
msgid "The following oversized messages remain on server %s account %s:"
-msgstr ""
-"Predmet: Fetchmail-varovanie: nadrozmerná správa.\n"
-"\n"
-"Nasledujúca nadrozmerná správa zostáva na po¹tovom serveri %s:"
+msgstr "fetchlimit %d dosiahnutý; %d správ ponecháných na serveri %s úèet %s\n"
#: driver.c:362
#, fuzzy, c-format
@@ -2700,9 +2694,9 @@ msgid "can't raise the listener; falling back to %s"
msgstr ""
#: sink.c:1346
-#, fuzzy, c-format
+#, c-format
msgid "Error writing to MDA: %s\n"
-msgstr "Chyba pri uvoµòovaní osobných údajov\n"
+msgstr ""
#: sink.c:1349
#, c-format
@@ -2808,9 +2802,9 @@ msgid "Try adding the --service option (see also FAQ item R12).\n"
msgstr ""
#: socket.c:296 socket.c:299
-#, fuzzy, c-format
+#, c-format
msgid "unknown (%s)"
-msgstr "hostiteµ je neznámy."
+msgstr ""
#: socket.c:302
#, c-format
@@ -3055,7 +3049,7 @@ msgstr "Doèasný zoznam UID-ov:"
#: uid.c:517 uid.c:569
#, fuzzy, c-format
msgid "Merged UID list from %s:"
-msgstr "Starý zoznam UID z %s:"
+msgstr "Nový zoznam UID z %s:"
#: uid.c:519
#, c-format
@@ -3111,12 +3105,21 @@ msgstr "malloc zlyhal\n"
msgid "realloc failed\n"
msgstr "realloc zlyhal\n"
-#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
-#~ msgstr "SIGPIPE obdr¾ané z MDA alebo chyba v prúde dát zo socketu\n"
+#~ msgid ""
+#~ "Subject: Fetchmail oversized-messages warning.\n"
+#~ "\n"
+#~ "The following oversized messages remain on the mail server %s:"
+#~ msgstr ""
+#~ "Predmet: Fetchmail-varovanie: nadrozmerná správa.\n"
+#~ "\n"
+#~ "Nasledujúca nadrozmerná správa zostáva na po¹tovom serveri %s:"
#~ msgid "header "
#~ msgstr "záhlavie "
+#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n"
+#~ msgstr "SIGPIPE obdr¾ané z MDA alebo chyba v prúde dát zo socketu\n"
+
#~ msgid "internal inconsistency\n"
#~ msgstr "vnútorná nezrovnalos»\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ed5c2837..c702e7ee 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: fetchmail 6.3.8\n"
+"Project-Id-Version: fetchmail 6.3.9-rc3\n"
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
"POT-Creation-Date: 2008-06-30 15:43+0200\n"
-"PO-Revision-Date: 2008-02-23 15:37+0800\n"
+"PO-Revision-Date: 2008-11-05 22:30+0800\n"
"Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
"sourceforge.net>\n"
@@ -608,7 +608,6 @@ msgid "Option --check is not supported with ETRN\n"
msgstr "ETRN �支� --check 选项\n"
#: fetchmail.c:137
-#, fuzzy
msgid ""
"Copyright (C) 2002, 2003 Eric S. Raymond\n"
"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
@@ -619,8 +618,8 @@ msgstr ""
"Copyright (C) 2002, 2003 Eric S. Raymond\n"
"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
"Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
#: fetchmail.c:142
msgid ""
@@ -752,7 +751,7 @@ msgstr "无法打开 %s 添加记录\n"
#: fetchmail.c:612
msgid "--check mode enabled, not fetching mail\n"
-msgstr ""
+msgstr "开� --check 模�, 而�真正�回邮件\n"
#: fetchmail.c:634
#, fuzzy, c-format
@@ -1152,9 +1151,9 @@ msgid " SSL trusted certificate directory: %s\n"
msgstr " SSL �信�书目录: %s\n"
#: fetchmail.c:1642
-#, fuzzy, c-format
+#, c-format
msgid " SSL server CommonName: %s\n"
-msgstr "�务器通用�: %s\n"
+msgstr "�务器的 CommonName: %s\n"
#: fetchmail.c:1644
#, c-format
@@ -1930,261 +1929,261 @@ msgstr "用法: fetchmail [选项] [�务器...]\n"
#: options.c:592
msgid " Options are as follows:\n"
-msgstr " 以下这些是选项:\n"
+msgstr "选项如下:\n"
#: options.c:593
msgid " -?, --help display this option help\n"
-msgstr " -?, --help 显示此选项帮助\n"
+msgstr " -?, --help\t显示此选项帮助\n"
#: options.c:594
msgid " -V, --version display version info\n"
-msgstr " -V, --version 显示版本信�\n"
+msgstr " -V, --version\t显示版本信�\n"
#: options.c:596
msgid " -c, --check check for messages without fetching\n"
-msgstr " -c, --check �检查邮件而�收�\n"
+msgstr " -c, --check\t�检查邮件而�收�\n"
#: options.c:597
msgid " -s, --silent work silently\n"
-msgstr " -s, --silent �行时��显示多余信�\n"
+msgstr " -s, --silent\t�行时��显示多余信�\n"
#: options.c:598
msgid " -v, --verbose work noisily (diagnostic output)\n"
-msgstr " -v, --verbose �行时给出信� (诊断型的输出)\n"
+msgstr " -v, --verbose\t�行时给出信� (诊断型的输出)\n"
#: options.c:599
msgid " -d, --daemon run as a daemon once per n seconds\n"
-msgstr " -d, --daemon � n 秒�行���务一次\n"
+msgstr " -d, --daemon\t� n 秒�行���务一次\n"
#: options.c:600
msgid " -N, --nodetach don't detach daemon process\n"
-msgstr " -N, --nodetach �分离��进程\n"
+msgstr " -N, --nodetach\t�分离��进程\n"
#: options.c:601
msgid " -q, --quit kill daemon process\n"
-msgstr " -q, --quit 终止��进程\n"
+msgstr " -q, --quit\t终止��进程\n"
#: options.c:602
msgid " -L, --logfile specify logfile name\n"
-msgstr " -L, --logfile 指定日志文件�\n"
+msgstr " -L, --logfile\t指定日志文件�\n"
#: options.c:603
msgid ""
" --syslog use syslog(3) for most messages when running as a "
"daemon\n"
-msgstr " --syslog 以���务�行时用 syslog(3) 得到更多的信�\n"
+msgstr " --syslog\t以���务�行时用 syslog(3) 得到更多的信�\n"
#: options.c:604
msgid " --invisible don't write Received & enable host spoofing\n"
-msgstr " --invisible �写 Received 邮件头并�许伪装主机\n"
+msgstr " --invisible\t�写 Received 邮件头并�许伪装主机\n"
#: options.c:605
msgid " -f, --fetchmailrc specify alternate run control file\n"
-msgstr " -f, --fetchmailrc 指定�选的�置文件\n"
+msgstr " -f, --fetchmailrc\t指定�选的�置文件\n"
#: options.c:606
msgid " -i, --idfile specify alternate UIDs file\n"
-msgstr " -i, --idfile 指定�选的 UIDs 文件\n"
+msgstr " -i, --idfile\t指定�选的 UIDs 文件\n"
#: options.c:607
msgid " --pidfile specify alternate PID (lock) file\n"
-msgstr " --pidfile 指定�选的进程(�)文件\n"
+msgstr " --pidfile\t指定�选的进程(�)文件\n"
#: options.c:608
msgid " --postmaster specify recipient of last resort\n"
-msgstr " --postmaster 指定邮件管�员\n"
+msgstr " --postmaster\t指定邮件管�员\n"
#: options.c:609
msgid " --nobounce redirect bounces from user to postmaster.\n"
-msgstr " --nobounce 将回�邮件从用户�定�至邮件管�员\n"
+msgstr " --nobounce\t将回�邮件从用户�定�至邮件管�员\n"
#: options.c:611
msgid " -I, --interface interface required specification\n"
-msgstr " -I, --interface 指定网络地�\n"
+msgstr " -I, --interface\t指定网络地�\n"
#: options.c:612
msgid " -M, --monitor monitor interface for activity\n"
-msgstr " -M, --moniter 监控指定网络地�的活跃度\n"
+msgstr " -M, --moniter\t监控指定网络地�的活跃度\n"
#: options.c:615
msgid " --ssl enable ssl encrypted session\n"
-msgstr " --ssl �用 ssl 加密会�\n"
+msgstr " --ssl\t�用 ssl 加密会�\n"
#: options.c:616
msgid " --sslkey ssl private key file\n"
-msgstr " --sslkey ssl �钥文件\n"
+msgstr " --sslkey\tssl �钥文件\n"
#: options.c:617
msgid " --sslcert ssl client certificate\n"
-msgstr " --sslcert ssl 客户端�书\n"
+msgstr " --sslcert\tssl 客户端�书\n"
#: options.c:618
msgid " --sslcertck do strict server certificate check (recommended)\n"
-msgstr " --sslcertck 进行严格的�务器�书检查(推�)\n"
+msgstr " --sslcertck\t进行严格的�务器�书检查(推�)\n"
#: options.c:619
msgid " --sslcertpath path to ssl certificates\n"
-msgstr " --sslcertpath ssl �书目录\n"
+msgstr " --sslcertpath\tssl �书目录\n"
#: options.c:620
msgid ""
" --sslcommonname expect this CommonName from server (discouraged)\n"
-msgstr ""
+msgstr " --sslcommonname\t期望�务器返回 CommonName (�鼓励)\n"
#: options.c:621
msgid ""
" --sslfingerprint fingerprint that must match that of the server's "
"cert.\n"
-msgstr " --sslfingerprint 指定一个指纹,它必须与�务器�书的指纹匹�\n"
+msgstr " --sslfingerprint\t指定一个指纹,它必须与�务器�书的指纹匹�\n"
#: options.c:622
msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n"
-msgstr " --sslproto 指定强制使用的 ssl �议(SSL2/SSL3/TLS1)\n"
+msgstr " --sslproto\t指定强制使用的 ssl �议(SSL2/SSL3/TLS1)\n"
#: options.c:624
msgid " --plugin specify external command to open connection\n"
-msgstr " --plugin 指定外部程�打开连接\n"
+msgstr " --plugin\t指定外部程�打开连接\n"
#: options.c:625
msgid " --plugout specify external command to open smtp connection\n"
-msgstr " --plugout 指定外部程�打开 smtp 连接\n"
+msgstr " --plugout\t指定外部程�打开 smtp 连接\n"
#: options.c:627
msgid " -p, --protocol specify retrieval protocol (see man page)\n"
-msgstr " -p, --protocol 指定收件�议 (看 man 手册页)\n"
+msgstr " -p, --protocol\t指定收件�议 (看 man 手册页)\n"
#: options.c:628
msgid " -U, --uidl force the use of UIDLs (pop3 only)\n"
-msgstr " -U, --uidl 强制使用 UIDLs(仅适用于 pop3)\n"
+msgstr " -U, --uidl\t强制使用 UIDLs(仅适用于 pop3)\n"
#: options.c:629
msgid " --port TCP port to connect to (obsolete, use --service)\n"
-msgstr " --port �连接的 TCP 端�(过时了,用 --service)\n"
+msgstr " --port\t�连接的 TCP 端�(过时了,用 --service)\n"
#: options.c:630
msgid ""
" -P, --service TCP service to connect to (can be numeric TCP port)\n"
-msgstr " -P, --service �连接的 TCP �务(�许用 TCP 端�的数值�表示)\n"
+msgstr " -P, --service\t�连接的 TCP �务(�许用 TCP 端�的数值�表示)\n"
#: options.c:631
msgid " --auth authentication type (password/kerberos/ssh/otp)\n"
-msgstr " --auth 指定验�方�(password/kerberos/ssh/otp)\n"
+msgstr " --auth\t指定验�方�(password/kerberos/ssh/otp)\n"
#: options.c:632
msgid " -t, --timeout server nonresponse timeout\n"
-msgstr " -t, --timeout 指定�务器超时无�应的时间\n"
+msgstr " -t, --timeout\t指定�务器超时无�应的时间\n"
#: options.c:633
msgid " -E, --envelope envelope address header\n"
-msgstr " -E, --envelope 指定邮件地�头\n"
+msgstr " -E, --envelope\t指定邮件地�头\n"
#: options.c:634
msgid " -Q, --qvirtual prefix to remove from local user id\n"
-msgstr " -Q, --qvirtual 从当�用户移除�缀\n"
+msgstr " -Q, --qvirtual\t从当�用户移除�缀\n"
#: options.c:635
msgid " --principal mail service principal\n"
-msgstr "--principal 邮件�务验�方\n"
+msgstr " --principal\t邮件�务验�方\n"
#: options.c:636
msgid " --tracepolls add poll-tracing information to Received header\n"
-msgstr " --tracepolls Received 邮件头中添加收件跟踪信�\n"
+msgstr " --tracepolls\tReceived 邮件头中添加收件跟踪信�\n"
#: options.c:638
msgid " -u, --username specify users's login on server\n"
-msgstr " -u, --username 指定登录�务器的用户�\n"
+msgstr " -u, --username\t指定登录�务器的用户�\n"
#: options.c:639
msgid " -a, --[fetch]all retrieve old and new messages\n"
-msgstr " -a, --[fetch]all 收�所有新旧邮件\n"
+msgstr " -a, --[fetch]all\t收�所有新旧邮件\n"
#: options.c:640
msgid " -K, --nokeep delete new messages after retrieval\n"
-msgstr " -K, --nokeep 收件�删除�务器上新邮件\n"
+msgstr " -K, --nokeep\t收件�删除�务器上新邮件\n"
#: options.c:641
msgid " -k, --keep save new messages after retrieval\n"
-msgstr " -k, --keep 收件��留�务器上新邮件\n"
+msgstr " -k, --keep\t收件��留�务器上新邮件\n"
#: options.c:642
msgid " -F, --flush delete old messages from server\n"
-msgstr " -F, --flush 从�务器上删除旧邮件\n"
+msgstr " -F, --flush\t从�务器上删除旧邮件\n"
#: options.c:643
msgid " --limitflush delete oversized messages\n"
-msgstr " --limitflush 删除超大的邮件\n"
+msgstr " --limitflush\t删除过大的邮件\n"
#: options.c:644
msgid " -n, --norewrite don't rewrite header addresses\n"
-msgstr " -n, --norewrite ���写地�头\n"
+msgstr " -n, --norewrite\t���写地�头\n"
#: options.c:645
msgid " -l, --limit don't fetch messages over given size\n"
-msgstr " -l, --limit �收超过指定大�的邮件\n"
+msgstr " -l, --limit\t�收超过指定大�的邮件\n"
#: options.c:646
msgid " -w, --warnings interval between warning mail notification\n"
-msgstr " -w, --warnings 邮件通知警告的间隔\n"
+msgstr " -w, --warnings\t邮件通知警告的间隔\n"
#: options.c:648
msgid " -S, --smtphost set SMTP forwarding host\n"
-msgstr " -S, --smtphost 设置 SMTP 转�主机\n"
+msgstr " -S, --smtphost\t设置 SMTP 转�主机\n"
#: options.c:649
msgid " --fetchdomains fetch mail for specified domains\n"
-msgstr " --fetchdomains 收�指定域的邮件\n"
+msgstr " --fetchdomains\t收�指定域的邮件\n"
#: options.c:650
msgid " -D, --smtpaddress set SMTP delivery domain to use\n"
-msgstr " -D, --smtpaddress 设置 SMTP 投递域\n"
+msgstr " -D, --smtpaddress\t设置 SMTP 投递域\n"
#: options.c:651
msgid " --smtpname set SMTP full name username@domain\n"
-msgstr " --smtpname 设置 SMTP 全�,用户�@域\n"
+msgstr " --smtpname\t设置 SMTP 全�,用户�@域\n"
#: options.c:652
msgid " -Z, --antispam, set antispam response values\n"
-msgstr " -Z, --antispam, 设置 antispam �应值\n"
+msgstr " -Z, --antispam,\t设置 antispam �应值\n"
#: options.c:653
msgid " -b, --batchlimit set batch limit for SMTP connections\n"
-msgstr " -b, --bathlimit 为 SMTP 连接设置批�处��制\n"
+msgstr " -b, --bathlimit\t为 SMTP 连接设置批�处��制\n"
#: options.c:654
msgid " -B, --fetchlimit set fetch limit for server connections\n"
-msgstr " -B, --fetchlimit 为�务器连接设置收��制\n"
+msgstr " -B, --fetchlimit\t为�务器连接设置收��制\n"
#: options.c:655
msgid " --fetchsizelimit set fetch message size limit\n"
-msgstr " --fetchsizelimit 设置收件大��制\n"
+msgstr " --fetchsizelimit\t设置收件大��制\n"
#: options.c:656
msgid " --fastuidl do a binary search for UIDLs\n"
-msgstr " --fastuidl 对 UIDLs 进行折�查找\n"
+msgstr " --fastuidl\t对 UIDLs 进行折�查找\n"
#: options.c:657
msgid " -e, --expunge set max deletions between expunges\n"
-msgstr " -e, --expunge 设置删除�作�生在多少�邮件之�\n"
+msgstr " -e, --expunge\t设置删除�作�生在多少�邮件之�\n"
#: options.c:658
msgid " -m, --mda set MDA to use for forwarding\n"
-msgstr " -m, --mda 设置用于转�的 MDA\n"
+msgstr " -m, --mda\t设置用于转�的 MDA\n"
#: options.c:659
msgid " --bsmtp set output BSMTP file\n"
-msgstr " --bsmtp 设置 BSMTP 文件输出\n"
+msgstr " --bsmtp\t设置 BSMTP 文件输出\n"
#: options.c:660
msgid " --lmtp use LMTP (RFC2033) for delivery\n"
-msgstr " --lmtp 用 LMTP �议(RFC2033) 投递邮件\n"
+msgstr " --lmtp\t用 LMTP �议(RFC2033) 投递邮件\n"
#: options.c:661
msgid " -r, --folder specify remote folder name\n"
-msgstr " -r, --folder 指定远程邮箱�\n"
+msgstr " -r, --folder\t指定远程邮箱�\n"
#: options.c:662
msgid " --showdots show progress dots even in logfiles\n"
-msgstr " --showdots �使在日志文件中也�显示进度�(以点的形�)\n"
+msgstr " --showdots\t�使在日志文件中也�显示进度�(以点的形�)\n"
#: pop3.c:355
msgid ""
@@ -2297,9 +2296,9 @@ msgid "File %s must be a regular file.\n"
msgstr "文件 %s 必须是个普通文件。\n"
#: rcfile_y.y:431
-#, fuzzy, c-format
+#, c-format
msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
-msgstr "文件 %s �能拥有多于 -rwx--x--- (0710) 的��。\n"
+msgstr "文件 %s ��许拥有高于 -rwx------ (0700) 的��。\n"
#: rcfile_y.y:443
#, c-format
@@ -2549,14 +2548,14 @@ msgid "BSMTP preamble write failed.\n"
msgstr "写入 BSMTP 报头失败。\n"
#: sink.c:972
-#, fuzzy, c-format
+#, c-format
msgid "%cMTP listener doesn't like recipient address `%s'\n"
-msgstr "%cMTP 端�喜欢收件人地� “%s�\n"
+msgstr "%cMTP 端�认�收件人地� “%s�\n"
#: sink.c:979
-#, fuzzy, c-format
+#, c-format
msgid "%cMTP listener doesn't really like recipient address `%s'\n"
-msgstr "%cMTP 端�是真的喜欢收件人地� “%s�\n"
+msgstr "%cMTP 端�是真的认�收件人地� “%s�\n"
#: sink.c:1025
msgid "no address matches; no postmaster set.\n"
@@ -2745,29 +2744,29 @@ msgstr "未知的组织\n"
#: socket.c:617
#, c-format
msgid "Issuer CommonName: %s\n"
-msgstr "�行者通用�: %s\n"
+msgstr "�行者 CommonName: %s\n"
#: socket.c:619
msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr "警告: �行者通用�太长 (�能截短)。\n"
+msgstr "警告: �行者 CommonName 太长 (�能截短)。\n"
#: socket.c:621
msgid "Unknown Issuer CommonName\n"
-msgstr "未知的�行者通用�\n"
+msgstr "未知的�行者 CommonName\n"
#: socket.c:625
#, c-format
msgid "Server CommonName: %s\n"
-msgstr "�务器通用�: %s\n"
+msgstr "�务器 CommonName: %s\n"
#: socket.c:629
msgid "Bad certificate: Subject CommonName too long!\n"
-msgstr "�书错误: 主通用�太长!\n"
+msgstr "�书错误: 主 CommonName 太长!\n"
#: socket.c:675
#, c-format
msgid "Server CommonName mismatch: %s != %s\n"
-msgstr "�务器通用��匹�: %s != %s\n"
+msgstr "�务器 CommonName �匹�: %s != %s\n"
#: socket.c:681
msgid "Server name not set, could not verify certificate!\n"
@@ -2775,7 +2774,7 @@ msgstr "未设置�务器�称,无法验��书�\n"
#: socket.c:686
msgid "Unknown Server CommonName\n"
-msgstr "未知的�务器通用�\n"
+msgstr "未知的�务器 CommonName\n"
#: socket.c:688
msgid "Server name not specified in certificate!\n"