Translation updates

diff --git a/src/backend/po/zh_CN.po b/src/backend/po/zh_CN.po
index 17578ba8e29889f800ea72e8321f0413d1ecd7b5..45cc91e0d8249115210ce74bae731190c68cb95b 100644 (file)
--- a/src/backend/po/zh_CN.po
+++ b/src/backend/po/zh_CN.po
@@ -1,13 +1,13 @@
 # simplified Chinese translation file for PostgreSQL server
 # Weiping He <laser@zhengmai.com.cn>, 2001.
 #
-# $PostgreSQL: pgsql/src/backend/po/zh_CN.po,v 1.9 2004/12/11 19:08:56 petere Exp $
+# $PostgreSQL: pgsql/src/backend/po/zh_CN.po,v 1.10 2005/01/06 09:07:12 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 10:00+0000\n"
+"POT-Creation-Date: 2004-12-14 10:09+0000\n"
 "PO-Revision-Date: 2003-09-15 13:49:24+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -220,8 +220,8 @@ msgid "function with OID %u does not exist"
 msgstr "OID Ϊ %u µÄº¯Êý²»´æÔÚ"
 
 #: tcop/fastpath.c:291 tcop/postgres.c:287 tcop/postgres.c:310
-#: commands/copy.c:403 commands/copy.c:421 commands/copy.c:425
-#: commands/copy.c:486 commands/copy.c:535
+#: commands/copy.c:404 commands/copy.c:422 commands/copy.c:426
+#: commands/copy.c:487 commands/copy.c:536
 msgid "unexpected EOF on client connection"
 msgstr "ÔÚ¿Í»§¶ËÁª½ÓÉϵÄÒâÍâ EOF"
 
@@ -560,7 +560,7 @@ msgid "invalid DESCRIBE message subtype %d"
 msgstr "ÎÞЧµÄ DESCRIBE ÐÅÏ¢×ÓÀàÐÍ %d"
 
 #: tcop/postgres.c:3341 nodes/print.c:86 storage/lmgr/deadlock.c:888
-#: commands/vacuumlazy.c:517 commands/vacuumlazy.c:820 commands/vacuum.c:2257
+#: commands/vacuumlazy.c:517 commands/vacuumlazy.c:820 commands/vacuum.c:2273
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -656,7 +656,7 @@ msgstr "
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "ȨÏÞ²»¹»: \"%s\" ÊÇÒ»¸öϵͳ±í"
 
-#: tcop/utility.c:323 commands/copy.c:905 executor/execMain.c:443
+#: tcop/utility.c:323 commands/copy.c:906 executor/execMain.c:443
 msgid "transaction is read-only"
 msgstr "ÊÂÎñÊÇÖ»¶Á"
 
@@ -2498,11 +2498,11 @@ msgstr "
 msgid "invalid mask length: %d"
 msgstr "ÎÞЧÑÚÂ볤¶È: %d"
 
-#: utils/adt/selfuncs.c:3370 utils/adt/selfuncs.c:3757
+#: utils/adt/selfuncs.c:3370 utils/adt/selfuncs.c:3775
 msgid "case insensitive matching not supported on type bytea"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3475 utils/adt/selfuncs.c:3918
+#: utils/adt/selfuncs.c:3477 utils/adt/selfuncs.c:3936
 msgid "regular-expression matching not supported on type bytea"
 msgstr "ÔÚ bytea ÀàÐÍÉϲ»Ö§³ÖÕýÔò±í´ïʽƥÅä"
 
@@ -2637,8 +2637,8 @@ msgstr "
 
 #: utils/adt/array_userfuncs.c:362 utils/adt/arrayfuncs.c:216
 #: utils/adt/arrayfuncs.c:472 utils/adt/arrayfuncs.c:1153
-#: utils/adt/arrayfuncs.c:2421 executor/execQual.c:257 executor/execQual.c:285
-#: executor/execQual.c:2065
+#: utils/adt/arrayfuncs.c:2421 executor/execQual.c:260 executor/execQual.c:288
+#: executor/execQual.c:2138
 #, c-format
 msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
 msgstr ""
@@ -2683,7 +2683,7 @@ msgstr "ȱ
 msgid "malformed array literal: \"%s\""
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:507 executor/execQual.c:2085
+#: utils/adt/arrayfuncs.c:507 executor/execQual.c:2158
 msgid ""
 "multidimensional arrays must have array expressions with matching dimensions"
 msgstr ""
@@ -2943,8 +2943,8 @@ msgstr ""
 msgid "function %u has too many arguments (%d, maximum is %d)"
 msgstr "º¯Êý %u ²ÎÊýÌ«¶à (%d, ×î´ó¸öÊýΪ %d)"
 
-#: utils/fmgr/funcapi.c:39 executor/execQual.c:866 executor/execQual.c:910
-#: executor/execQual.c:1086 executor/execQual.c:1211 executor/execQual.c:3445
+#: utils/fmgr/funcapi.c:39 executor/execQual.c:870 executor/execQual.c:914
+#: executor/execQual.c:1090 executor/execQual.c:1215 executor/execQual.c:3580
 #: executor/functions.c:666 executor/functions.c:705
 msgid "set-valued function called in context that cannot accept a set"
 msgstr ""
@@ -3044,7 +3044,7 @@ msgstr "
 #: utils/init/miscinit.c:832 utils/init/miscinit.c:841 utils/misc/guc.c:4798
 #: utils/misc/guc.c:4862 access/transam/xlog.c:1556 access/transam/xlog.c:1680
 #: access/transam/xlog.c:2975 access/transam/xlog.c:3013
-#: commands/tablespace.c:664 commands/tablespace.c:670 commands/copy.c:1117
+#: commands/tablespace.c:664 commands/tablespace.c:670 commands/copy.c:1118
 #: postmaster/postmaster.c:2917 postmaster/postmaster.c:2927
 #, c-format
 msgid "could not write to file \"%s\": %m"
@@ -3662,7 +3662,7 @@ msgstr "
 
 #: utils/misc/guc.c:1006
 msgid "This includes operations such as VACUUM and CREATE INDEX."
-msgstr ""
+msgstr "´Ë´¦¶¯×÷°üÀ¨ VACUUM ºÍ CREATE INDEX."
 
 #: utils/misc/guc.c:1014
 msgid "Sets the maximum stack depth, in kilobytes."
@@ -3705,11 +3705,11 @@ msgstr "ֵΪ 0 
 msgid ""
 "Sets the maximum number of tables and indexes for which free space is "
 "tracked."
-msgstr ""
+msgstr "Ϊ±»¸ú×Ù¿ÕÏпռäµÄ±íºÍË÷ÒýÉèÖÃ×î´ó¸öÊý."
 
 #: utils/misc/guc.c:1115
 msgid "Sets the maximum number of disk pages for which free space is tracked."
-msgstr ""
+msgstr "Ϊ±»¸ú×Ù¿ÕÏпռäµÄ´ÅÅÌÒ³ (disk page) ÉèÖÃ×î´ó¸öÊý."
 
 #: utils/misc/guc.c:1124
 msgid "Sets the maximum number of locks per transaction."
@@ -3750,13 +3750,13 @@ msgstr ""
 
 #: utils/misc/guc.c:1185
 msgid "Sets the number of disk-page buffers in shared memory for WAL."
-msgstr ""
+msgstr "Ϊ WAL ÉèÖù²ÏíÄÚ´æÖдÅÅÌÒ³»º³åÇøµÄ¸öÊý."
 
 #: utils/misc/guc.c:1194
 msgid ""
 "Sets the delay in microseconds between transaction commit and flushing WAL "
 "to disk."
-msgstr ""
+msgstr "ÉèÖÃÊÂÎïÌá½»ºÍˢРWAL µ½´ÅÅ̼äµÄÑÓ³Ùʱ¼ä, µ¥Î»Î¢Ãë."
 
 #: utils/misc/guc.c:1204
 msgid ""
@@ -3877,11 +3877,11 @@ msgstr "
 
 #: utils/misc/guc.c:1418
 msgid "WAL archiving command."
-msgstr ""
+msgstr "WAL ¹éµµÃüÁî."
 
 #: utils/misc/guc.c:1419
 msgid "The shell command that will be called to archive a WAL file."
-msgstr ""
+msgstr "¹éµµÒ»¸ö WAL Îļþ½«µ÷Óà shell ÃüÁî."
 
 #: utils/misc/guc.c:1427
 msgid "Sets the client's character set encoding."
@@ -3928,13 +3928,13 @@ msgstr "
 #: utils/misc/guc.c:1477
 msgid ""
 "Causes all statements generating error at or above this level to be logged."
-msgstr ""
+msgstr "Ôڴ˼¶±ð»òÒÔÉϼ¶±ð, ËùÓÐÓï¾ä²úÉúµÄ´íÎ󽫱»¼Ç¼."
 
 #: utils/misc/guc.c:1478
 msgid ""
 "All SQL statements that cause an error of the specified level or a higher "
 "level are logged."
-msgstr ""
+msgstr "ÔÚÖ¸¶¨¼¶±ð»ò¸ü¸ß¼¶±ð, ËùÓÐ SQL Óï¾ä²úÉúµÄ´íÎ󽫱»¼Ç¼."
 
 #: utils/misc/guc.c:1487
 msgid "Controls information prefixed to each log line"
@@ -5944,16 +5944,16 @@ msgstr "BEFORE STATEMENT 
 msgid "could not serialize access due to concurrent update"
 msgstr ""
 
-#: commands/trigger.c:2723
+#: commands/trigger.c:2731
 msgid "unnamed constraints cannot be set explicitly"
 msgstr ""
 
-#: commands/trigger.c:2762
+#: commands/trigger.c:2770
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "Ô¼Êø \"%s\" ²»¿ÉÕ¹»º"
 
-#: commands/trigger.c:2777 commands/tablecmds.c:4574
+#: commands/trigger.c:2785 commands/tablecmds.c:4574
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "Ô¼Êø \"%s\" ²»´æÔÚ"
@@ -6095,10 +6095,10 @@ msgstr "
 #: commands/functioncmds.c:244 commands/functioncmds.c:252
 #: commands/functioncmds.c:260 commands/dbcommands.c:108
 #: commands/dbcommands.c:116 commands/dbcommands.c:124
-#: commands/dbcommands.c:132 commands/copy.c:720 commands/copy.c:728
-#: commands/copy.c:736 commands/copy.c:744 commands/copy.c:752
-#: commands/copy.c:760 commands/copy.c:768 commands/copy.c:776
-#: commands/copy.c:784 commands/user.c:576 commands/user.c:588
+#: commands/dbcommands.c:132 commands/copy.c:721 commands/copy.c:729
+#: commands/copy.c:737 commands/copy.c:745 commands/copy.c:753
+#: commands/copy.c:761 commands/copy.c:769 commands/copy.c:777
+#: commands/copy.c:785 commands/user.c:576 commands/user.c:588
 #: commands/user.c:596 commands/user.c:604 commands/user.c:612
 #: commands/user.c:620 commands/user.c:826 commands/user.c:838
 #: commands/user.c:846 commands/user.c:854 commands/user.c:1356
@@ -6353,113 +6353,113 @@ msgstr "Ŀ
 msgid "conversion \"%s\" already exists in schema \"%s\""
 msgstr "Ô¼Êø \"%s\" ÒѾ­´æÔÚÓÚģʽ \"%s\" ÖÐ"
 
-#: commands/prepare.c:61
+#: commands/prepare.c:62
 msgid "invalid statement name: must not be empty"
 msgstr "ÎÞЧµÄÓï¾äÃû³Æ: ²»ÄÜΪ¿Õ"
 
-#: commands/prepare.c:80
+#: commands/prepare.c:81
 msgid "utility statements cannot be prepared"
 msgstr "²»ÄÜ×¼±¸ºÃ¹¤¾ßÓï¾ä"
 
-#: commands/prepare.c:168 commands/prepare.c:173 commands/prepare.c:535
+#: commands/prepare.c:179 commands/prepare.c:184 commands/prepare.c:544
 msgid "prepared statement is not a SELECT"
 msgstr "×¼±¸ºÃµÄÓï¾ä²»ÊÇÒ»¸ö SELECT"
 
-#: commands/prepare.c:307
+#: commands/prepare.c:317
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "×¼±¸ºÃµÄÓï¾ä \"%s\" ÒѾ­´æÔÚ"
 
-#: commands/prepare.c:387
+#: commands/prepare.c:396
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "×¼±¸ºÃµÄÓï¾ä \"%s\" ²»´æÔÚ"
 
-#: commands/copy.c:204 commands/copy.c:216 commands/copy.c:249
-#: commands/copy.c:259
+#: commands/copy.c:205 commands/copy.c:217 commands/copy.c:250
+#: commands/copy.c:260
 msgid "COPY BINARY is not supported to stdout or from stdin"
 msgstr "COPOY BINARY ²»Ö§³ÖÊä³öµ½±ê×¼Êä³ö»òÀ´×Ô±ê×¼ÊäÈë"
 
-#: commands/copy.c:312
+#: commands/copy.c:313
 #, c-format
 msgid "could not write to COPY file: %m"
 msgstr "ÎÞ·¨Ð´Èë COPY Îļþ: %m"
 
-#: commands/copy.c:320
+#: commands/copy.c:321
 msgid "connection lost during COPY to stdout"
 msgstr "COPY µ½±ê×¼Êä³öµÄ¹ý³ÌÖÐÁª½ÓÖжÏ"
 
-#: commands/copy.c:437
+#: commands/copy.c:438
 #, c-format
 msgid "COPY from stdin failed: %s"
 msgstr "´Ó±ê×¼ÊäÈëÉÏ COPY ʧ°Ü: %s"
 
-#: commands/copy.c:453
+#: commands/copy.c:454
 #, c-format
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr "ÒâÍâµÄÐÅÏ¢ÀàÐÍ 0x%02X, ÔÚ±ê×¼ÊäÈëÉÏ COPY µÄ¹ý³ÌÖÐ"
 
-#: commands/copy.c:795
+#: commands/copy.c:796
 msgid "cannot specify DELIMITER in BINARY mode"
 msgstr "ÔÚ BINARY ģʽÖÐÄã²»ÄÜÖ¸¶¨ DELIMITER"
 
-#: commands/copy.c:800
+#: commands/copy.c:801
 msgid "cannot specify CSV in BINARY mode"
 msgstr "ÔÚ BINARY ģʽÖв»ÄÜÖ¸¶¨ CSV"
 
-#: commands/copy.c:805
+#: commands/copy.c:806
 msgid "cannot specify NULL in BINARY mode"
 msgstr "ÔÚ BINARY ģʽÖÐÄã²»ÄÜÖ¸¶¨ NULL"
 
-#: commands/copy.c:828
+#: commands/copy.c:829
 msgid "COPY delimiter must be a single character"
 msgstr "COPY µÄ·Ö¸ô·û±ØÐèÊǵ¥¸ö×Ö·û"
 
-#: commands/copy.c:836
+#: commands/copy.c:837
 msgid "COPY quote available only in CSV mode"
 msgstr ""
 
-#: commands/copy.c:841
+#: commands/copy.c:842
 msgid "COPY quote must be a single character"
 msgstr "COPY ÒýºÅ (quote) ±ØÐèÊǵ¥¸ö×Ö·û"
 
-#: commands/copy.c:849
+#: commands/copy.c:850
 msgid "COPY escape available only in CSV mode"
 msgstr "COPY תÒå (escape) Ö»ÔÚ CSV ģʽÖÐÓÐЧ"
 
-#: commands/copy.c:854
+#: commands/copy.c:855
 msgid "COPY escape must be a single character"
 msgstr "COPY תÒå (escape) ±ØÐèÊǵ¥¸ö×Ö·û"
 
-#: commands/copy.c:862
+#: commands/copy.c:863
 msgid "COPY force quote available only in CSV mode"
 msgstr ""
 
-#: commands/copy.c:866
+#: commands/copy.c:867
 msgid "COPY force quote only available using COPY TO"
 msgstr ""
 
-#: commands/copy.c:874
+#: commands/copy.c:875
 msgid "COPY force not null available only in CSV mode"
 msgstr ""
 
-#: commands/copy.c:878
+#: commands/copy.c:879
 msgid "COPY force not null only available using COPY FROM"
 msgstr ""
 
-#: commands/copy.c:886
+#: commands/copy.c:887
 msgid "COPY delimiter must not appear in the NULL specification"
 msgstr ""
 
-#: commands/copy.c:894
+#: commands/copy.c:895
 msgid "CSV quote character must not appear in the NULL specification"
 msgstr ""
 
-#: commands/copy.c:916
+#: commands/copy.c:917
 msgid "must be superuser to COPY to or from a file"
 msgstr "±ØÐë³ÉΪ³¬¼¶Óû§²ÅÄÜ COPY µ½Îļþ»ò´ÓÎļþ COPY"
 
-#: commands/copy.c:917
+#: commands/copy.c:918
 msgid ""
 "Anyone can COPY to stdout or from stdin. psql's \\copy command also works "
 "for anyone."
@@ -6467,188 +6467,188 @@ msgstr ""
 "ÈκÎÈË¿ÉÒÔ COPY µ½±ê×¼Êä³ö»òÀ´×Ô±ê×¼ÊäÈëµÄ COPY. ÈκÎÈËÒ²¿ÉÒÔʹÓà Psql µÄ "
 "\\copy ÃüÁî."
 
-#: commands/copy.c:926
+#: commands/copy.c:927
 #, c-format
 msgid "table \"%s\" does not have OIDs"
 msgstr "±í \"%s\" ûÓÐ OID"
 
-#: commands/copy.c:952
+#: commands/copy.c:953
 #, c-format
 msgid "FORCE QUOTE column \"%s\" not referenced by COPY"
 msgstr ""
 
-#: commands/copy.c:975
+#: commands/copy.c:976
 #, c-format
 msgid "FORCE NOT NULL column \"%s\" not referenced by COPY"
 msgstr ""
 
-#: commands/copy.c:1002
+#: commands/copy.c:1003
 #, c-format
 msgid "cannot copy to view \"%s\""
 msgstr "²»¿ÉÒÔ¿½±´µ½ÊÓͼ \"%s\""
 
-#: commands/copy.c:1007
+#: commands/copy.c:1008
 #, c-format
 msgid "cannot copy to sequence \"%s\""
 msgstr "²»¿ÉÒÔ¿½±´µ½ÐòÁÐ \"%s\""
 
-#: commands/copy.c:1012
+#: commands/copy.c:1013
 #, c-format
 msgid "cannot copy to non-table relation \"%s\""
 msgstr "²»¿ÉÒÔ¿½±´µ½·Ç±í¹Øϵ \"%s\""
 
-#: commands/copy.c:1031
+#: commands/copy.c:1032
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "ΪÁ˶ÁÈ¡, ÎÞ·¨´ò¿ªÎļþ \"%s\": %m"
 
-#: commands/copy.c:1040 commands/copy.c:1103
+#: commands/copy.c:1041 commands/copy.c:1104
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" ÊÇÒ»¸öĿ¼"
 
-#: commands/copy.c:1053
+#: commands/copy.c:1054
 #, c-format
 msgid "cannot copy from view \"%s\""
 msgstr "²»¿ÉÒÔ´ÓÊÓͼ \"%s\" ¿½±´"
 
-#: commands/copy.c:1058
+#: commands/copy.c:1059
 #, c-format
 msgid "cannot copy from sequence \"%s\""
 msgstr "²»¿ÉÒÔ´ÓÐòÁÐ \"%s\" ¿½±´"
 
-#: commands/copy.c:1063
+#: commands/copy.c:1064
 #, c-format
 msgid "cannot copy from non-table relation \"%s\""
 msgstr "²»¿ÉÒԴӷDZí¹Øϵ \"%s\" ¿½±´"
 
-#: commands/copy.c:1085
+#: commands/copy.c:1086
 msgid "relative path not allowed for COPY to file"
 msgstr "COPY µ½Îļþ²»ÔÊÐíÏà¶Ô·¾¶"
 
-#: commands/copy.c:1094
+#: commands/copy.c:1095
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "ΪÁËдÈë, ÎÞ·¨´ò¿ªÎļþ \"%s\": %m"
 
-#: commands/copy.c:1386
+#: commands/copy.c:1388
 #, c-format
 msgid "COPY %s, line %d, column %s"
 msgstr "COPY %s, ÐÐ %d, ÁÐ %s"
 
-#: commands/copy.c:1389 commands/copy.c:1422
+#: commands/copy.c:1391 commands/copy.c:1424
 #, c-format
 msgid "COPY %s, line %d"
 msgstr "COPY %s, ÐÐ %d"
 
-#: commands/copy.c:1397
+#: commands/copy.c:1399
 #, c-format
 msgid "COPY %s, line %d, column %s: \"%s\""
 msgstr "COPY %s, ÐÐ %d, ÁÐ %s: \"%s\""
 
-#: commands/copy.c:1408
+#: commands/copy.c:1410
 #, c-format
 msgid "COPY %s, line %d: \"%s\""
 msgstr "COPY %s, ÐÐ %d: \"%s\""
 
-#: commands/copy.c:1634
+#: commands/copy.c:1636
 msgid "COPY file signature not recognized"
 msgstr "ÎļþÇ©×Ö²»±»ÈÏ¿É"
 
-#: commands/copy.c:1640
+#: commands/copy.c:1642
 msgid "invalid COPY file header (missing flags)"
 msgstr "ÎÞЧµÄ COPY ÎļþÍ· (ȱÉÙ±êÖ¾)"
 
-#: commands/copy.c:1646
+#: commands/copy.c:1648
 msgid "unrecognized critical flags in COPY file header"
 msgstr "ÔÚ COPY ÎļþÍ·Óв»ÈϿɵÄΣÏÕ±êÖ¾"
 
-#: commands/copy.c:1652
+#: commands/copy.c:1654
 msgid "invalid COPY file header (missing length)"
 msgstr "ÎÞЧµÄ COPY ÎļþÍ· (ȱÉÙ³¤¶È)"
 
-#: commands/copy.c:1660
+#: commands/copy.c:1662
 msgid "invalid COPY file header (wrong length)"
 msgstr "ÎÞЧµÄ COPY ÎļþÍ· (´íÎ󳤶È)"
 
-#: commands/copy.c:1739
+#: commands/copy.c:1741
 msgid "null OID in COPY data"
 msgstr "ÔÚ COPY Êý¾ÝÖÐûÓÐ OID"
 
-#: commands/copy.c:1748 commands/copy.c:1845
+#: commands/copy.c:1750 commands/copy.c:1847
 msgid "invalid OID in COPY data"
 msgstr "ÔÚ COPY Êý¾ÝÖÐÎÞЧµÄ OID"
 
-#: commands/copy.c:1768
+#: commands/copy.c:1770
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "×ֶΠ\"%s\" ȱÉÙÊý¾Ý"
 
-#: commands/copy.c:1778
+#: commands/copy.c:1780
 msgid "unterminated CSV quoted field"
 msgstr "CSV ÒýºÅÓòûÓнáÊø"
 
-#: commands/copy.c:1813
+#: commands/copy.c:1815
 msgid "extra data after last expected column"
 msgstr "×îºóÆÚÍû×ֶκóÓжîÍâÊý¾Ý"
 
-#: commands/copy.c:1831
+#: commands/copy.c:1833
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr "Ôª×é×ֶμÆÊýÊÇ %d, ÆÚÍû¼ÆÊýÊÇ %d"
 
-#: commands/copy.c:2053 commands/copy.c:2071
+#: commands/copy.c:2055 commands/copy.c:2073
 msgid "literal carriage return found in data"
 msgstr ""
 
-#: commands/copy.c:2054 commands/copy.c:2072
+#: commands/copy.c:2056 commands/copy.c:2074
 msgid "Use \"\\r\" to represent carriage return."
 msgstr ""
 
-#: commands/copy.c:2089
+#: commands/copy.c:2091
 msgid "literal newline found in data"
 msgstr ""
 
-#: commands/copy.c:2090
+#: commands/copy.c:2092
 msgid "Use \"\\n\" to represent newline."
 msgstr "ʹÓà \"\\n\" ±íʾÐÂÐÐ."
 
-#: commands/copy.c:2110 commands/copy.c:2126
+#: commands/copy.c:2112 commands/copy.c:2128
 msgid "end-of-copy marker does not match previous newline style"
 msgstr ""
 
-#: commands/copy.c:2114 commands/copy.c:2120
+#: commands/copy.c:2116 commands/copy.c:2122
 msgid "end-of-copy marker corrupt"
 msgstr ""
 
-#: commands/copy.c:2485 commands/copy.c:2507
+#: commands/copy.c:2487 commands/copy.c:2509
 msgid "unexpected EOF in COPY data"
 msgstr "ÔÚ COPY Êý¾ÝÖÐÒâÍâµÄ EOF"
 
-#: commands/copy.c:2494
+#: commands/copy.c:2496
 msgid "invalid field size"
 msgstr "ÎÞЧ×ֶγߴç"
 
-#: commands/copy.c:2521
+#: commands/copy.c:2523
 msgid "incorrect binary data format"
 msgstr "²»ÕýÈ·µÄ¶þ½øÖÆÊý¾Ý¸ñʽ"
 
-#: commands/copy.c:2707 parser/parse_target.c:650 parser/parse_target.c:660
+#: commands/copy.c:2728 parser/parse_target.c:650 parser/parse_target.c:660
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "×ֶΠ\"%s\" ±»Ö¸¶¨¶à´Î"
 
-#: commands/vacuumlazy.c:221 commands/vacuum.c:1160
+#: commands/vacuumlazy.c:221 commands/vacuum.c:1181
 #, c-format
 msgid "vacuuming \"%s.%s\""
 msgstr "ÕýÔÚÇåÀí (vacuum)  \"%s.%s\""
 
-#: commands/vacuumlazy.c:293 commands/vacuum.c:1208
+#: commands/vacuumlazy.c:293 commands/vacuum.c:1229
 #, c-format
 msgid "relation \"%s\" page %u is uninitialized --- fixing"
 msgstr "¹Øϵ \"%s\" Ò³ %u ûÓгõʼ»¯ --- ÐÞ¸´"
 
-#: commands/vacuumlazy.c:456 commands/vacuum.c:1498
+#: commands/vacuumlazy.c:456 commands/vacuum.c:1518
 #, c-format
 msgid ""
 "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
@@ -6668,20 +6668,20 @@ msgstr ""
 msgid "\"%s\": removed %d row versions in %d pages"
 msgstr ""
 
-#: commands/vacuumlazy.c:630 commands/vacuumlazy.c:705 commands/vacuum.c:2859
-#: commands/vacuum.c:2926
+#: commands/vacuumlazy.c:630 commands/vacuumlazy.c:705 commands/vacuum.c:2900
+#: commands/vacuum.c:2967
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr ""
 
-#: commands/vacuumlazy.c:634 commands/vacuum.c:2863
+#: commands/vacuumlazy.c:634 commands/vacuum.c:2904
 #, c-format
 msgid ""
 "%u index pages have been deleted, %u are currently reusable.\n"
 "%s"
 msgstr ""
 
-#: commands/vacuumlazy.c:709 commands/vacuum.c:2930
+#: commands/vacuumlazy.c:709 commands/vacuum.c:2971
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -6689,7 +6689,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: commands/vacuumlazy.c:817 commands/vacuum.c:2769
+#: commands/vacuumlazy.c:817 commands/vacuum.c:2810
 #, c-format
 msgid "\"%s\": truncated %u to %u pages"
 msgstr ""
@@ -7083,7 +7083,7 @@ msgstr "
 msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "Ë÷ÒýÉùÃ÷Öк¯Êý±ØÐè±ê¼ÇΪ IMMUTABLE"
 
-#: commands/indexcmds.c:475 commands/tablecmds.c:1329 parser/parse_expr.c:1084
+#: commands/indexcmds.c:475 commands/tablecmds.c:1329 parser/parse_expr.c:1085
 #, c-format
 msgid "column \"%s\" does not exist"
 msgstr "×ֶΠ\"%s\" ²»´æÔÚ"
@@ -7190,8 +7190,8 @@ msgid "inherited column \"%s\" has a type conflict"
 msgstr "¼Ì³ÐÊôÐÔ \"%s\" ÀàÐͳåÍ»"
 
 #: commands/tablecmds.c:830 commands/tablecmds.c:975 parser/parse_coerce.c:239
-#: parser/parse_coerce.c:1125 parser/parse_coerce.c:1142
-#: parser/parse_coerce.c:1188
+#: parser/parse_coerce.c:1130 parser/parse_coerce.c:1147
+#: parser/parse_coerce.c:1193
 #, c-format
 msgid "%s versus %s"
 msgstr "%s ¶Ô %s"
@@ -7687,68 +7687,76 @@ msgstr "ֻ
 msgid "must be superuser to rename procedural language"
 msgstr "Ö»ÓÐÓг¬¼¶Óû§È¨ÏÞµÄÓû§²ÅÄܶԹý³ÌÓïÑÔÖØÃüÃû"
 
-#: commands/vacuum.c:586
+#: commands/vacuum.c:286
+msgid "VACUUM FULL FREEZE is not supported"
+msgstr "VACUUM FULL FREEZE ²»Ö§³Ö"
+
+#: commands/vacuum.c:287
+msgid "Use VACUUM FULL, then VACUUM FREEZE."
+msgstr "ÏÈʹÓà VACUUM FULL, È»ºóÔÙʹÓà VACUUM FREEZE."
+
+#: commands/vacuum.c:607
 msgid "oldest xmin is far in the past"
 msgstr ""
 
-#: commands/vacuum.c:587
+#: commands/vacuum.c:608
 msgid "Close open transactions soon to avoid wraparound problems."
 msgstr "Á¢¼´¹Ø±ÕÒÑ´ò¿ªµÄÊÂÎï, ÒÔ±ÜÃâ wraparound ÎÊÌâ."
 
-#: commands/vacuum.c:804
+#: commands/vacuum.c:825
 msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr "һЩÊý¾Ý¿âÔÚ³¬¹ý 20 ÒÚ±ÊÊÂÎïºóûÓÐ×öÇåÀí (vacuum)."
 
-#: commands/vacuum.c:805
+#: commands/vacuum.c:826
 msgid "You may have already suffered transaction-wraparound data loss."
 msgstr ""
 
-#: commands/vacuum.c:816
+#: commands/vacuum.c:837
 msgid "some databases have not been vacuumed in over 1 billion transactions"
 msgstr "һЩÊý¾Ý¿âÔÚ³¬¹ý 10 ÒÚ±ÊÊÂÎïºóûÓÐ×öÇåÀí (vacuum)."
 
-#: commands/vacuum.c:817
+#: commands/vacuum.c:838
 msgid "Better vacuum them soon, or you may have a wraparound failure."
 msgstr ""
 
-#: commands/vacuum.c:824
+#: commands/vacuum.c:845
 #, c-format
 msgid "some databases have not been vacuumed in %d transactions"
 msgstr "һЩÊý¾Ý¿âÔÚ³¬¹ý %d ±ÊÊÂÎïºóûÓÐ×öÇåÀí (vacuum)."
 
-#: commands/vacuum.c:826
+#: commands/vacuum.c:847
 #, c-format
 msgid ""
 "Better vacuum them within %d transactions, or you may have a wraparound "
 "failure."
 msgstr ""
 
-#: commands/vacuum.c:922
+#: commands/vacuum.c:943
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can vacuum it"
 msgstr "ºöÂÔ \"%s\" --- Ö»Óбí»òÊý¾Ý¿âÊôÖ÷Äܹ»ÇåÀí (vacuum)"
 
-#: commands/vacuum.c:937
+#: commands/vacuum.c:958
 #, c-format
 msgid ""
 "skipping \"%s\" --- cannot vacuum indexes, views, or special system tables"
 msgstr "ºöÂÔ \"%s\" --- ÎÞ·¨ÇåÀí (vacuum) Ë÷Òý, ÊÓͼ»òÌØÊâµÄϵͳ±í"
 
-#: commands/vacuum.c:1331
+#: commands/vacuum.c:1352
 #, c-format
 msgid ""
 "relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- can't shrink "
 "relation"
 msgstr ""
 
-#: commands/vacuum.c:1344
+#: commands/vacuum.c:1365
 #, c-format
 msgid ""
 "relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- can't shrink "
 "relation"
 msgstr ""
 
-#: commands/vacuum.c:1501
+#: commands/vacuum.c:1521
 #, c-format
 msgid ""
 "%.0f dead row versions cannot be removed yet.\n"
@@ -7760,18 +7768,18 @@ msgid ""
 "%s"
 msgstr ""
 
-#: commands/vacuum.c:2254
+#: commands/vacuum.c:2270
 #, c-format
 msgid "\"%s\": moved %u row versions, truncated %u to %u pages"
 msgstr ""
 
-#: commands/vacuum.c:2877 commands/vacuum.c:2946
+#: commands/vacuum.c:2918 commands/vacuum.c:2987
 #, c-format
 msgid ""
 "index \"%s\" contains %.0f row versions, but table contains %.0f row versions"
 msgstr ""
 
-#: commands/vacuum.c:2880 commands/vacuum.c:2949
+#: commands/vacuum.c:2921 commands/vacuum.c:2990
 msgid "Rebuild the index with REINDEX."
 msgstr "ʹÓà REINDEX Öؽ¨Ë÷Òý."
 
@@ -7970,7 +7978,7 @@ msgstr ""
 msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
 msgstr ""
 
-#: parser/parse_agg.c:74 optimizer/util/clauses.c:428 executor/execQual.c:2804
+#: parser/parse_agg.c:74 optimizer/util/clauses.c:428 executor/execQual.c:2877
 msgid "aggregate function calls may not be nested"
 msgstr "¾Û¼¯º¯Êýµ÷Óò»ÔÊÐíǶÌ×"
 
@@ -8078,85 +8086,85 @@ msgstr "û
 msgid "inconsistent types deduced for parameter $%d"
 msgstr ""
 
-#: parser/parse_coerce.c:691 parser/parse_coerce.c:718
-#: parser/parse_coerce.c:734 parser/parse_coerce.c:748
-#: parser/parse_expr.c:1654
+#: parser/parse_coerce.c:696 parser/parse_coerce.c:723
+#: parser/parse_coerce.c:739 parser/parse_coerce.c:753
+#: parser/parse_expr.c:1658
 #, c-format
 msgid "cannot cast type %s to %s"
 msgstr "ÎÞ·¨°ÑÀàÐÍ %s ת»»Îª %s"
 
-#: parser/parse_coerce.c:721
+#: parser/parse_coerce.c:726
 msgid "Input has too few columns."
 msgstr "ÊäÈë×Ö¶ÎÌ«ÉÙ"
 
-#: parser/parse_coerce.c:737
+#: parser/parse_coerce.c:742
 #, c-format
 msgid "Cannot cast type %s to %s in column %d."
 msgstr "²»ÄÜ°ÑµÚ %3$d ¸ö×ֶεÄÀàÐÍ %1$s ת»»Îª %2$s."
 
-#: parser/parse_coerce.c:751
+#: parser/parse_coerce.c:756
 msgid "Input has too many columns."
 msgstr "ÊäÈë×Ö¶ÎÌ«¶à"
 
 #. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:785
+#: parser/parse_coerce.c:790
 #, c-format
 msgid "argument of %s must be type boolean, not type %s"
 msgstr "%s µÄ²ÎÊý±ØÐèÊDz¼¶ûÀàÐÍ, ¶ø²»ÊÇ %s ÀàÐÍ"
 
 #. translator: %s is name of a SQL construct, eg WHERE
 #. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:793 parser/parse_coerce.c:832
+#: parser/parse_coerce.c:798 parser/parse_coerce.c:837
 #, c-format
 msgid "argument of %s must not return a set"
 msgstr "%s µÄ²ÎÊý²»ÄÜ·µ»ØÒ»¸ö×éºÏ"
 
 #. translator: first %s is name of a SQL construct, eg LIMIT
-#: parser/parse_coerce.c:824
+#: parser/parse_coerce.c:829
 #, c-format
 msgid "argument of %s must be type integer, not type %s"
 msgstr "%s µÄ²ÎÊý±ØÐèÊÇÕûÊýÀàÐÍ, ¶ø²»ÊÇ %s ÀàÐÍ"
 
-#: parser/parse_coerce.c:886
+#: parser/parse_coerce.c:891
 #, c-format
 msgid "%s types %s and %s cannot be matched"
 msgstr "%s µÄÀàÐÍ %s ºÍ %s ²»Æ¥Åä"
 
 #. translator: first %s is name of a SQL construct, eg CASE
-#: parser/parse_coerce.c:948
+#: parser/parse_coerce.c:953
 #, c-format
 msgid "%s could not convert type %s to %s"
 msgstr "%s ÎÞ·¨×ª»»ÀàÐÍ %s Ϊ %s"
 
-#: parser/parse_coerce.c:1124
+#: parser/parse_coerce.c:1129
 msgid "arguments declared \"anyelement\" are not all alike"
 msgstr "²ÎÊýÉùÃ÷µÄ \"anyelement\" ²»È«Ïàͬ"
 
-#: parser/parse_coerce.c:1141
+#: parser/parse_coerce.c:1146
 msgid "arguments declared \"anyarray\" are not all alike"
 msgstr "²ÎÊýÉùÃ÷µÄ \"anyarray\" ²»È«Ïàͬ"
 
-#: parser/parse_coerce.c:1170 parser/parse_coerce.c:1282
-#: parser/parse_coerce.c:1309
+#: parser/parse_coerce.c:1175 parser/parse_coerce.c:1287
+#: parser/parse_coerce.c:1314
 #, c-format
 msgid "argument declared \"anyarray\" is not an array but type %s"
 msgstr "²ÎÊýÉùÃ÷µÄ \"anyarray\" ²»ÊÇÒ»¸öÊý×é, µ«ÊÇÀàÐÍΪ %s"
 
-#: parser/parse_coerce.c:1187
+#: parser/parse_coerce.c:1192
 msgid ""
 "argument declared \"anyarray\" is not consistent with argument declared "
 "\"anyelement\""
 msgstr "²ÎÊýÉùÃ÷µÄ \"anyarray\" ºÍ²ÎÊýÉùÃ÷µÄ \"anyelement\" ²»Ò»ÖÂ"
 
-#: parser/parse_coerce.c:1198
+#: parser/parse_coerce.c:1203
 msgid ""
 "could not determine anyarray/anyelement type because input has type \"unknown"
 "\""
 msgstr "ÎÞ·¨È·¶¨ anyarray/anyelement ÀàÐÍ, ÒòΪÊäÈëÀàÐÍΪ \"unknown\""
 
-#: parser/parse_coerce.c:1223 parser/parse_coerce.c:1240
-#: parser/parse_coerce.c:1294 parser/parse_expr.c:794 parser/parse_expr.c:1350
-#: parser/parse_expr.c:1389 parser/parse_oper.c:920
+#: parser/parse_coerce.c:1228 parser/parse_coerce.c:1245
+#: parser/parse_coerce.c:1299 parser/parse_expr.c:794 parser/parse_expr.c:1351
+#: parser/parse_expr.c:1390 parser/parse_oper.c:920
 #, c-format
 msgid "could not find array type for data type %s"
 msgstr "ÎÞ·¨ÎªÊý¾ÝÀàÐÍ %s ÕÒµ½Êý×éÀàÐÍ"
@@ -8195,7 +8203,7 @@ msgstr "CREATE ASSERTION 
 msgid "DROP ASSERTION is not yet implemented"
 msgstr "DROP ASSERTION ÈÔδʵÏÖ"
 
-#: gram.y:2515 gram.y:7425 parser/parse_expr.c:1183 parser/parse_target.c:736
+#: gram.y:2515 gram.y:7425 parser/parse_expr.c:1184 parser/parse_target.c:736
 #: catalog/namespace.c:1201
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
@@ -8648,21 +8656,21 @@ msgstr "
 msgid "subquery has too few columns"
 msgstr "×Ó²éѯ×Ö¶ÎÌ«ÉÙ"
 
-#: parser/parse_expr.c:1157 parser/parse_target.c:727 catalog/namespace.c:1195
+#: parser/parse_expr.c:1158 parser/parse_target.c:727 catalog/namespace.c:1195
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "δʵÏÖ¿çÊý¾Ý¿â¹ØÁª: %s"
 
-#: parser/parse_expr.c:1688 parser/parse_expr.c:1767
+#: parser/parse_expr.c:1692 parser/parse_expr.c:1771
 msgid "unequal number of entries in row expression"
 msgstr ""
 
-#: parser/parse_expr.c:1709
+#: parser/parse_expr.c:1713
 #, c-format
 msgid "operator %s is not supported for row expressions"
 msgstr "Ðбí´ïʽ²»Ö§³Ö²Ù×÷·û %s"
 
-#: parser/parse_expr.c:1804
+#: parser/parse_expr.c:1808
 msgid "IS DISTINCT FROM requires = operator to yield boolean"
 msgstr ""
 
@@ -8825,7 +8833,8 @@ msgstr ""
 msgid ""
 "cannot assign to field \"%s\" of column \"%s\" because there is no such "
 "column in data type %s"
-msgstr "ÎÞ·¨¸ø×ֶΠ\"%2$s\" µÄÊý¾ÝÓò \"%1$s\" ¸³Öµ, ÒòΪÔÚÊý¾ÝÀàÐÍ %3$s ÖÐûÓдËÁÐ"
+msgstr ""
+"ÎÞ·¨¸ø×ֶΠ\"%2$s\" µÄÊý¾ÝÓò \"%1$s\" ¸³Öµ, ÒòΪÔÚÊý¾ÝÀàÐÍ %3$s ÖÐûÓдËÁÐ"
 
 #: parser/parse_target.c:567
 #, c-format
@@ -8894,62 +8903,62 @@ msgstr "
 msgid "SELECT FOR UPDATE is not allowed in subqueries"
 msgstr "SELECT FOR UPDATE ²»ÔÊÐíÔÚ×Ó²éѯÖÐ"
 
-#: optimizer/util/clauses.c:2348
+#: optimizer/util/clauses.c:2357
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "SQL º¯Êý \"%s\" ÔÚÄÚÁª (inlining) ÆÚ¼ä"
 
-#: executor/execQual.c:811
+#: executor/execQual.c:815
 msgid "functions and operators can take at most one set argument"
 msgstr "º¯ÊýºÍ²Ù×÷·û×î¶à´øÒ»×é²ÎÊý"
 
-#: executor/execQual.c:1293
+#: executor/execQual.c:1297
 msgid "function returning set of rows cannot return null value"
 msgstr "º¯Êý·µ»ØֵΪ¶àÁÐʱ²»ÄÜ·µ»Ø¿ÕÖµ"
 
-#: executor/execQual.c:1377
+#: executor/execQual.c:1381
 msgid "table-function protocol for materialize mode was not followed"
 msgstr ""
 
-#: executor/execQual.c:1384
+#: executor/execQual.c:1388
 #, c-format
 msgid "unrecognized table-function returnMode: %d"
 msgstr "δÈÏ¿ÉµÄ±íº¯Êý·µ»Øģʽ (returnMode): %d"
 
-#: executor/execQual.c:1530
+#: executor/execQual.c:1534
 msgid "IS DISTINCT FROM does not support set arguments"
 msgstr "IS DISTINCT FROM ²»Ö§³ÖÒ»×é²ÎÊý"
 
-#: executor/execQual.c:1604
+#: executor/execQual.c:1608
 msgid "op ANY/ALL (array) does not support set arguments"
 msgstr "²Ù×÷·û ANY/ALL (Êý×é) ²»Ö§³ÖÉèÖòÎÊý"
 
-#: executor/execQual.c:2051
+#: executor/execQual.c:2124
 msgid "cannot merge incompatible arrays"
 msgstr "ÎÞ·¨ºÏ²¢²»¼æÈݵÄÅÅÁÐ"
 
-#: executor/execQual.c:2052
+#: executor/execQual.c:2125
 #, c-format
 msgid ""
 "Array with element type %s cannot be included in ARRAY construct with "
 "element type %s."
 msgstr "ÔªËØÀàÐÍΪ %s µÄ ARRAY ½á¹¹Öв»ÄÜ°üº¬´øÓÐÔªËØÀàÐÍΪ %s µÄÊý×é."
 
-#: executor/execQual.c:2251
+#: executor/execQual.c:2324
 msgid "NULLIF does not support set arguments"
 msgstr "NULLIF ²»Ö§³ÖÒ»×é²ÎÊý"
 
-#: executor/execQual.c:2432
+#: executor/execQual.c:2505
 #, c-format
 msgid "domain %s does not allow null values"
 msgstr "Óò %s ²»ÔÊÐí¿ÕÖµ"
 
-#: executor/execQual.c:2462
+#: executor/execQual.c:2535
 #, c-format
 msgid "value for domain %s violates check constraint \"%s\""
 msgstr "Óò %s µÄֵΥ·´Á˼ì²éÔ¼Êø \"%s\""
 
-#: executor/execQual.c:3066
+#: executor/execQual.c:3201
 #, c-format
 msgid "ROW() column has type %s instead of type %s"
 msgstr "ROW() ÁÐÀàÐÍ %s Ì滻Ϊ %s"

diff --git a/src/bin/pg_config/po/zh_CN.po b/src/bin/pg_config/po/zh_CN.po
index da388ab9e379b2a392ccd27d1ec868bde87da8e5..49764ff5cfdcd30cfc039b5b47ff764aaed7873d 100644 (file)
--- a/src/bin/pg_config/po/zh_CN.po
+++ b/src/bin/pg_config/po/zh_CN.po
@@ -6,10 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 10:00+0000\n"
-"PO-Revision-Date: 2003-09-15 13:49:24+0800\n"
-"Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
-"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
+"POT-Creation-Date: 2004-12-14 09:49+0000\n"
+"PO-Revision-Date: 2004-06-10 11:23+0000\n"
+"Last-Translator: Bao Wei<weibao@imsi.cn>\n"
+"Language-Team: Weiping He <laser@imsi.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/src/bin/pg_ctl/po/zh_CN.po b/src/bin/pg_ctl/po/zh_CN.po
index c6b4e116965ab7a94fed1bf31c407c78ff288c0e..0be654a2549953791f60b977ca1dcf68f4951075 100644 (file)
--- a/src/bin/pg_ctl/po/zh_CN.po
+++ b/src/bin/pg_ctl/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 09:53+0000\n"
+"POT-Creation-Date: 2004-12-14 09:49+0000\n"
 "PO-Revision-Date: 2004-06-10 11:23+0000\n"
 "Last-Translator: Bao Wei<weibao@imsi.cn>\n"
 "Language-Team: Weiping He <laser@imsi.cn>\n"

diff --git a/src/bin/pg_dump/po/zh_CN.po b/src/bin/pg_dump/po/zh_CN.po
index 98cdeb1f0de40d45dfd2c23d108a44ccee53039c..1ea5f66084969044622100bc7aad2cd3bf36046a 100644 (file)
--- a/src/bin/pg_dump/po/zh_CN.po
+++ b/src/bin/pg_dump/po/zh_CN.po
@@ -1,12 +1,12 @@
 # simplified Chinese translation file for pg_dump and friends
 # Weiping He <laser@zhengmai.com.cn>, 2001.
-# $PostgreSQL: pgsql/src/bin/pg_dump/po/zh_CN.po,v 1.7 2004/12/11 19:09:05 petere Exp $
+# $PostgreSQL: pgsql/src/bin/pg_dump/po/zh_CN.po,v 1.8 2005/01/06 09:07:15 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 09:55+0000\n"
+"POT-Creation-Date: 2004-12-05 12:19+0000\n"
 "PO-Revision-Date: 2004-01-10 13:46:59+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -215,11 +215,10 @@ msgstr "  -o, --oids               
 #: pg_dump.c:685
 #, c-format
 msgid ""
-"  -O, --no-owner           do not output commands to set object ownership\n"
+"  -O, --no-owner           skip restoration of object ownership\n"
 "                           in plain text format\n"
 msgstr ""
-"  -O, --no-owner           ÔÚÃ÷ÎĸñʽÖÐ, ÉèÖöÔÏóËùÊôÕßʱ²»Êä³ö\n"
-"                           Ã÷Áî\n"
+"  -O, --no-owner           ÔÚÃ÷ÎĸñʽÖÐ, ºöÂÔ»Ö¸´¶ÔÏóËùÊôÕß\n\n"
 
 #: pg_dump.c:687 pg_dumpall.c:353
 #, c-format
@@ -1578,11 +1577,10 @@ msgstr ""
 "  -L, --use-list=ÎļþÃû    ´ÓÕâ¸öÎļþÖÐʹÓÃÖ¸¶¨µÄÄÚÈݱíÅÅÐò\n"
 "                           Êä³ö\n"
 
-#: pg_restore.c:379
+#: pg_restore.c:379 pg_dumpall.c:352
 #, c-format
-msgid ""
-"  -O, --no-owner           do not issue commands to set object ownership\n"
-msgstr "  -O, --no-owner           ÉèÖöÔÏóµÄËùÊôÕßʱ²»Êä³öÃüÁî\n"
+msgid "  -O, --no-owner           skip restoration of object ownership\n"
+msgstr "  -O, --no-owner           ºöÂÔ»Ö¸´¶ÔÏóËùÊôÕß\n"
 
 #: pg_restore.c:380
 #, c-format
@@ -1695,14 +1693,6 @@ msgstr "  -c, --clean              
 msgid "  -g, --globals-only       dump only global objects, no databases\n"
 msgstr "  -g, --globals-only       ֻת´¢È«¾Ö¶ÔÏó, ²»°üÀ¨Êý¾Ý¿â\n"
 
-#: pg_dumpall.c:352
-#, c-format
-msgid ""
-"  -O, --no-owner           do not output commands to set object ownership\n"
-msgstr ""
-"  -O, --no-owner           ÉèÖöÔÏóµÄËùÊôÕßʱ²»Êä³ö\n"
-"                           ÃüÁî\n"
-
 #: pg_dumpall.c:354
 #, c-format
 msgid ""
@@ -1810,3 +1800,10 @@ msgstr "
 #, c-format
 msgid "child process exited with unrecognized status %d"
 msgstr "×Ó½ø³ÌÒÑÍ˳ö, δ֪״̬ %d"
+
+#~ msgid ""
+#~ "  -O, --no-owner           do not output commands to set object "
+#~ "ownership\n"
+#~ msgstr ""
+#~ "  -O, --no-owner           ÉèÖöÔÏóµÄËùÊôÕßʱ²»Êä³ö\n"
+#~ "                           ÃüÁî\n"

diff --git a/src/bin/psql/po/zh_CN.po b/src/bin/psql/po/zh_CN.po
index eba0e08e34e0c449ba661b010c8cff89e9a7714c..bfee783f9406a743fbf3d8ff166583e8a4b2d515 100644 (file)
--- a/src/bin/psql/po/zh_CN.po
+++ b/src/bin/psql/po/zh_CN.po
@@ -1,13 +1,13 @@
-# simplified Chinese translation file for psql
-# Weiping He <laser@zhengmai.com.cn>, 2002.
-# 
-# $PostgreSQL: pgsql/src/bin/psql/po/zh_CN.po,v 1.8 2005/01/06 00:11:56 tgl Exp $
-# 
+# simplified Chinese translation file for psql\r
+# Weiping He <laser@zhengmai.com.cn>, 2002.\r
+# \r
+# $PostgreSQL: pgsql/src/bin/psql/po/zh_CN.po,v 1.9 2005/01/06 09:07:15 petere Exp $\r
+# \r
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 09:58+0000\n"
+"POT-Creation-Date: 2004-12-14 09:51+0000\n"
 "PO-Revision-Date: 2004-01-12 13:48:19+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -1733,9 +1733,9 @@ msgid ""
 "\n"
 "where option can be:\n"
 "\n"
-"    CREATEDB | NOCREATEDB\n"
+"    [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password' \n"
+"    | CREATEDB | NOCREATEDB\n"
 "    | CREATEUSER | NOCREATEUSER \n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password' \n"
 "    | VALID UNTIL 'abstime'\n"
 "\n"
 "ALTER USER name RENAME TO newname\n"
@@ -1747,9 +1747,9 @@ msgstr ""
 "\n"
 "Ñ¡Ïî¿ÉÒÔÊÇ:\n"
 "\n"
-"    CREATEDB | NOCREATEDB\n"
+"    [ ENCRYPTED | UNENCRYPTED ] PASSWORD '¿ÚÁî' \n"
+"    | CREATEDB | NOCREATEDB\n"
 "    | CREATEUSER | NOCREATEUSER \n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD '¿ÚÁî' \n"
 "    | VALID UNTIL 'ʱ¼ä'\n"
 "\n"
 "ALTER USER Ãû×Ö RENAME TO ÐÂÃû×Ö\n"
@@ -2380,10 +2380,10 @@ msgid ""
 "where option can be:\n"
 "    \n"
 "      SYSID uid \n"
+"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
 "    | CREATEDB | NOCREATEDB\n"
 "    | CREATEUSER | NOCREATEUSER\n"
 "    | IN GROUP groupname [, ...]\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
 "    | VALID UNTIL 'abstime'"
 msgstr ""
 "CREATE USER name [ [ WITH ] option [ ... ] ]\n"
@@ -2391,10 +2391,10 @@ msgstr ""
 "option ¿ÉÒÔΪ:\n"
 "    \n"
 "      SYSID uid \n"
+"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
 "    | CREATEDB | NOCREATEDB\n"
 "    | CREATEUSER | NOCREATEUSER\n"
 "    | IN GROUP groupname [, ...]\n"
-"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"
 "    | VALID UNTIL 'abstime'"
 
 #: sql_help.h:213
@@ -3128,9 +3128,8 @@ msgstr "
 
 #: sql_help.h:430
 msgid ""
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column "
-"[, ...] ) ] ]"
+"VACUUM [ FULL | FREEZE ] [ VERBOSE ] [ table ]\n"
+"VACUUM [ FULL | FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column [, ...] ) ] ]"
 msgstr ""
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ±í ]\n"
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ ±í [ (ÁÐ [, ...] ) ] ]"

diff --git a/src/bin/scripts/po/zh_CN.po b/src/bin/scripts/po/zh_CN.po
index 56a16da35e61125ec95b1d18ff8ba30bf10068ff..77064caa3c9816048f6ac861abefbfa7d3629518 100644 (file)
--- a/src/bin/scripts/po/zh_CN.po
+++ b/src/bin/scripts/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-15 14:20+0000\n"
+"POT-Creation-Date: 2004-12-14 09:49+0000\n"
 "PO-Revision-Date: 2003-09-15 21:03+0000\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -365,7 +365,7 @@ msgstr "  -E, --encrypted           
 
 #: createuser.c:249
 #, c-format
-msgid "  -N, --unencrypted         do not encrypt stored password\n"
+msgid "  -N, --unencrypted         do no encrypt stored password\n"
 msgstr "  -N, --unencrypted         ¿ÚÁî²»¼ÓÃÜ´æ´¢\n"
 
 #: createuser.c:250

diff --git a/src/interfaces/libpq/po/zh_CN.po b/src/interfaces/libpq/po/zh_CN.po
index 9c1474e38fa44a01eff554e840b093b1d3ad6f4a..bac57db0598e90d55e74ef552f9693fbc70afd94 100644 (file)
--- a/src/interfaces/libpq/po/zh_CN.po
+++ b/src/interfaces/libpq/po/zh_CN.po
@@ -1,13 +1,13 @@
 # simplified Chinese translation file for libpq\r
 # Bao Wei <weibao@forevertek.com>, 2002\r
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.7 2004/12/11 19:09:08 petere Exp $\r
+# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.8 2005/01/06 09:07:17 petere Exp $\r
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 10:00+0000\n"
+"POT-Creation-Date: 2004-12-03 23:54+0000\n"
 "PO-Revision-Date: 2003-09-15 13:47:06+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -46,8 +46,8 @@ msgstr "
 
 # fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284\r
 # fe-lobj.c:536\r
-#: fe-auth.c:530 fe-connect.c:1414 fe-connect.c:2629 fe-connect.c:2638
-#: fe-connect.c:3217 fe-lobj.c:556 fe-protocol2.c:1007 fe-protocol3.c:958
+#: fe-auth.c:530 fe-connect.c:1410 fe-connect.c:2625 fe-connect.c:2634
+#: fe-connect.c:3213 fe-lobj.c:556 fe-protocol2.c:1007 fe-protocol3.c:958
 msgid "out of memory\n"
 msgstr "ÄÚ´æÓþ¡\n"
 
@@ -89,24 +89,24 @@ msgstr "
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ÎÞЧµÄÈÏ֤ϵͳ: %d\n"
 
-#: fe-connect.c:458
+#: fe-connect.c:463
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "ÎÞЧµÄ sslmode Öµ: \"%s\"\n"
 
-#: fe-connect.c:478
+#: fe-connect.c:483
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr "ÎÞЧµÄ sslmode Öµ \"%s\" µ±Ã»ÓÐ°Ñ SSL Ö§³Ö±àÒë½øÀ´Ê±\n"
 
 # fe-connect.c:732\r
-#: fe-connect.c:794
+#: fe-connect.c:799
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "ÎÞ·¨½«Ì×½Ó×ÖÉèÖÃΪ TCP ÎÞÑÓ³Ùģʽ: %s\n"
 
 # fe-connect.c:752\r
-#: fe-connect.c:825
+#: fe-connect.c:830
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -118,7 +118,7 @@ msgstr ""
 "\t\"%s\"ÉÏ×¼±¸½ÓÊÜÁª½Ó?\n"
 
 # fe-connect.c:761\r
-#: fe-connect.c:837
+#: fe-connect.c:842
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -130,122 +130,122 @@ msgstr ""
 "%s É쵀 TCP/IP Áª½Ó?\n"
 
 # fe-misc.c:702\r
-#: fe-connect.c:930
+#: fe-connect.c:926
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "ÎÞ·¨½âÊÍÖ÷»úÃû \"%s\" µ½µØÖ·: %s\n"
 
 # fe-misc.c:702\r
-#: fe-connect.c:934
+#: fe-connect.c:930
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "ÎÞ·¨½âÊÍ Unix-domian Ì×½Ó×Ö·¾¶ \"%s\" µ½µØÖ·: %s\n"
 
 # fe-connect.c:1232\r
-#: fe-connect.c:1138
+#: fe-connect.c:1134
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "ÎÞЧµÄÁª½Ó״̬, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"
 
 # fe-connect.c:891\r
-#: fe-connect.c:1181
+#: fe-connect.c:1177
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "ÎÞ·¨´´½¨Ì×½Ó×Ö: %s\n"
 
 # fe-connect.c:708\r
-#: fe-connect.c:1204
+#: fe-connect.c:1200
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "ÎÞ·¨½«Ì×½Ó×ÖÉèÖÃΪ·Ç×èÈûģʽ: %s\n"
 
 # fe-auth.c:395\r
-#: fe-connect.c:1216
+#: fe-connect.c:1212
 #, c-format
 msgid "could not set socket to close-on-exec mode: %s\n"
 msgstr "ÎÞ·¨½«Ì×½Ó×ÖÉèÖÃΪִÐÐʱ¹Ø±Õ (close-on-exec) ģʽ: %s\n"
 
 # fe-connect.c:1263\r
-#: fe-connect.c:1308
+#: fe-connect.c:1304
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "ÎÞ·¨»ñÈ¡Ì×½Ó×Ö´íÎó״̬: %s\n"
 
 # fe-connect.c:1283\r
-#: fe-connect.c:1347
+#: fe-connect.c:1343
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "ÎÞ·¨´ÓÌ×½Ó×Ö»ñÈ¡¿Í»§¶ËµØÖ·: %s\n"
 
 # fe-connect.c:959\r
-#: fe-connect.c:1392
+#: fe-connect.c:1388
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "ÎÞ·¨·¢ËÍ SSL ÎÕÊÖ°ü: %s\n"
 
 # fe-connect.c:1322\r
-#: fe-connect.c:1427
+#: fe-connect.c:1423
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "ÎÞ·¨·¢ËÍÆô¶¯°ü: %s\n"
 
 # fe-connect.c:972\r
-#: fe-connect.c:1467
+#: fe-connect.c:1463
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "ÎÞ·¨ÊÕµ½·þÎñÆ÷¶Ô SSL ÎÕÊÖ°üµÄÏìÓ¦: %s\n"
 
 # fe-connect.c:1010\r
-#: fe-connect.c:1486 fe-connect.c:1503
+#: fe-connect.c:1482 fe-connect.c:1499
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "·þÎñÆ÷²»Ö§³Ö SSL, µ«ÊÇÒªÇóʹÓà SSL\n"
 
 # fe-connect.c:1001\r
-#: fe-connect.c:1519
+#: fe-connect.c:1515
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "ÊÕµ½¶Ô SSL ÎÕÊÖµÄÎÞЧÏìÓ¦: %c\n"
 
 # fe-connect.c:1378\r
-#: fe-connect.c:1576 fe-connect.c:1608
+#: fe-connect.c:1572 fe-connect.c:1604
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "ÆÚ´ýÀ´×Ô·þÎñÆ÷µÄÈÏÖ¤ÇëÇó, È´ÊÕµ½ %c\n"
 
 # fe-connect.c:1490\r
-#: fe-connect.c:1844
+#: fe-connect.c:1840
 msgid "unexpected message from server during startup\n"
 msgstr "Æô¶¯¹ý³ÌÖÐÊÕµ½À´×Ô·þÎñÆ÷µÄ·ÇÔ¤ÆÚÐÅÏ¢\n"
 
 # fe-connect.c:1549\r
-#: fe-connect.c:1914
+#: fe-connect.c:1910
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "ÎÞЧµÄÁª½Ó״̬ %c, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"
 
 # fe-connect.c:2475\r
-#: fe-connect.c:2677
+#: fe-connect.c:2673
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "ÔÚÁª½ÓÐÅÏ¢×Ö´®ÀïµÄ \"%s\" ºóÃæȱÉÙ \"=\"\n"
 
 # fe-connect.c:2524\r
-#: fe-connect.c:2726
+#: fe-connect.c:2722
 msgid "unterminated quoted string in connection info string\n"
 msgstr "Áª½ÓÐÅÏ¢×Ö´®ÖÐδ½áÊøµÄÒýºÅ×Ö´®\n"
 
 # fe-connect.c:2558\r
-#: fe-connect.c:2760
+#: fe-connect.c:2756
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "·Ç·¨Áª½ÓÑ¡Ïî \"%s\"\n"
 
 # fe-connect.c:2744\r
-#: fe-connect.c:2982
+#: fe-connect.c:2978
 msgid "connection pointer is NULL\n"
 msgstr "Áª½ÓÖ¸ÕëÊÇ NULL\n"
 
 # fe-connect.c:2953\r
-#: fe-connect.c:3239
+#: fe-connect.c:3235
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
@@ -594,138 +594,123 @@ msgstr "%s:%s"
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: not doing text COPY OUT\n"
 
-#: fe-secure.c:264
+#: fe-secure.c:271
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "ÎÞ·¨½¨Á¢ SSL Áª½Ó: %s\n"
 
-#: fe-secure.c:335 fe-secure.c:420 fe-secure.c:1033
+#: fe-secure.c:342 fe-secure.c:437 fe-secure.c:1057
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL ´íÎó: %s\n"
 
-#: fe-secure.c:340 fe-secure.c:425 fe-secure.c:1037
+#: fe-secure.c:347 fe-secure.c:443 fe-secure.c:1061
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALL ´íÎó: ·¢ÏÖ½áÊø·û\n"
 
 # fe-auth.c:232\r
-#: fe-secure.c:352 fe-secure.c:436 fe-secure.c:1056
+#: fe-secure.c:359 fe-secure.c:454 fe-secure.c:1080
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL ´íÎó: %s\n"
 
-#: fe-secure.c:362 fe-secure.c:446 fe-secure.c:1066
+#: fe-secure.c:369 fe-secure.c:464 fe-secure.c:1090
 #, c-format
 msgid "unrecognized SSL error code: %d\n"
 msgstr "δ֪µÄ SSL ´íÎóÂë: %d\n"
 
 # fe-lobj.c:498\r
-#: fe-secure.c:509
+#: fe-secure.c:533
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "²éѯÌ×½Ó×Ö´íÎó: %s\n"
 
 # fe-connect.c:1263\r
-#: fe-secure.c:537
+#: fe-secure.c:561
 #, c-format
 msgid "could not get information about host \"%s\": %s\n"
 msgstr "ÎÞ·¨»ñÈ¡¹ØÓÚÖ÷»ú \"%s\" µÄÐÅÏ¢: %s\n"
 
-#: fe-secure.c:556
+#: fe-secure.c:580
 msgid "unsupported protocol\n"
 msgstr "²»Ö§³ÖµÄЭÒé\n"
 
-#: fe-secure.c:578
+#: fe-secure.c:602
 #, c-format
 msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
 msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½ %ld.%ld.%ld.%ld\n"
 
-#: fe-secure.c:585
+#: fe-secure.c:609
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½¶Ô¶ËµØÖ·\n"
 
 # fe-connect.c:1263\r
-#: fe-secure.c:767
+#: fe-secure.c:791
 msgid "could not get user information\n"
 msgstr "ÎÞ·¨»ñÈ¡Óû§ÐÅÏ¢\n"
 
 # fe-lobj.c:400 fe-lobj.c:483\r
-#: fe-secure.c:777
+#: fe-secure.c:801
 #, c-format
 msgid "could not open certificate file \"%s\": %s\n"
 msgstr "ÎÞ·¨´ò¿ªÖ¤ÊéÎļþ \"%s\": %s\n"
 
 # fe-lobj.c:400 fe-lobj.c:483\r
-#: fe-secure.c:786
+#: fe-secure.c:810
 #, c-format
 msgid "could not read certificate file \"%s\": %s\n"
 msgstr "ÎÞ·¨¶ÁÈ¡Ö¤ÊéÎļþ \"%s\": %s\n"
 
-#: fe-secure.c:800
+#: fe-secure.c:824
 #, c-format
 msgid "certificate present, but not private key file \"%s\"\n"
 msgstr "ÓÐÖ¤Êé, µ«²»ÊÇ˽ԿÎļþ \"%s\"\n"
 
-#: fe-secure.c:808
+#: fe-secure.c:832
 #, c-format
 msgid "private key file \"%s\" has wrong permissions\n"
 msgstr "˽ԿÎļþ \"%s\" ÓдíÎóµÄÐí¿É\n"
 
 # fe-lobj.c:400 fe-lobj.c:483\r
-#: fe-secure.c:815
+#: fe-secure.c:839
 #, c-format
 msgid "could not open private key file \"%s\": %s\n"
 msgstr "ÎÞ·¨´ò¿ªË½Ô¿Îļþ \"%s\": %s\n"
 
-#: fe-secure.c:823
+#: fe-secure.c:847
 #, c-format
 msgid "private key file \"%s\" changed during execution\n"
 msgstr "ÔÚÖ´Ðйý³ÌÖÐ˽ԿÎļþ \"%s\" ¸Ä±äÁË\n"
 
 # fe-connect.c:891\r
-#: fe-secure.c:831
+#: fe-secure.c:855
 #, c-format
 msgid "could not read private key file \"%s\": %s\n"
 msgstr "ÎÞ·¨¶Áȡ˽ԿÎļþ \"%s\": %s\n"
 
-#: fe-secure.c:845
+#: fe-secure.c:869
 #, c-format
 msgid "certificate does not match private key file \"%s\": %s\n"
 msgstr "Ö¤Ê鲻ƥÅä˽ԿÎļþ \"%s\": %s\n"
 
-#: fe-secure.c:927
+#: fe-secure.c:951
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "ÎÞ·¨´´½¨ SSL »·¾³: %s\n"
 
 # fe-connect.c:891\r
-#: fe-secure.c:972
+#: fe-secure.c:996
 #, c-format
 msgid "could not read root certificate file \"%s\": %s\n"
 msgstr "ÎÞ·¨¶ÁÈ¡¸ùÖ¤ÊéÎļþ \"%s\": %s\n"
 
-#: fe-secure.c:1086
+#: fe-secure.c:1110
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "ÎÞ·¨ÑéÖ¤Ö¤Êé: %s\n"
 
-#: fe-secure.c:1100
+#: fe-secure.c:1124
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "ÎÞ·¨»ñµÃÖ¤Êé: %s\n"
-
-#~ msgid "certificate/private key mismatch (%s): %s\n"
-#~ msgstr "Ö¤Êé/˽Կ²»Æ¥Åä (%s): %s\n"
-
-# fe-misc.c:702\r
-#~ msgid "could not translate local service to address: %s\n"
-#~ msgstr "ÎÞ·¨½âÊͱ¾µØ·þÎñµ½µØÖ·: %s\n"
-
-# fe-connect.c:1010\r
-#~ msgid "server does not support SSL, and previous non-SSL attempt failed\n"
-#~ msgstr "·þÎñÆ÷²»Ö§³Ö SSL, ²¢ÇÒÏÈÇ°·Ç SSL ³¢ÊÔʧ°Ü\n"
-
-# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838\r
-#~ msgid "getaddrinfo() failed: %s\n"
-#~ msgstr "getaddrinfo() ʧ°Ü: %s\n"