Translation updates

src/bin/pg_controldata/po/zh_CN.po

@@ -3,85 +3,105 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.3\n"
+"Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2002-09-27 13:21+0800\n"
+"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2002-09-19 16:45+0800\n"
+"POT-Creation-Date: 2003-08-05 21:52+0000\n"
+"PO-Revision-Date: 2003-09-15 13:45+0800\n"
 "Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
-"Language-Team: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: pg_controldata.c:28
 #, c-format
-msgid "%s displays PostgreSQL database cluster control information.\n"
+msgid ""
-msgstr "%s <20><>ʾ PostgreSQL <20><><EFBFBD>ݿ<EFBFBD><DDBF>ؿ<EFBFBD><D8BF><EFBFBD><EFBFBD><EFBFBD>Ϣ.\n"
+"%s displays control information of a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s <20><>ʾ PostgreSQL <20><><EFBFBD>ݿ<EFBFBD><DDBF>ؿ<EFBFBD><D8BF><EFBFBD><EFBFBD><EFBFBD>Ϣ.\n"
+"\n"
 
-#: pg_controldata.c:29
+#: pg_controldata.c:32
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [DATADIR]\n"
+"  %s [OPTION]\n"
 "\n"
+"Options:\n"
+"  DATADIR        show cluster control information for DATADIR\n"
+"  --help         show this help, then exit\n"
+"  --version      output version information, then exit\n"
 msgstr ""
-"ʹ<EFBFBD>÷<EFBFBD><EFBFBD><EFBFBD>:\n"
+"<22>÷<EFBFBD>:\n"
-"  %s [<5B><><EFBFBD><EFBFBD>Ŀ¼]\n"
+"  %s [ѡ<EFBFBD><EFBFBD>]\n"
 "\n"
+"ѡ<><D1A1>:\n"
+"  DATADIR        <20><>ʾ DATADIR <20>Ĵؿ<C4B4><D8BF><EFBFBD><EFBFBD><EFBFBD>Ϣ\n"
+"  --help         <20><>ʾ<EFBFBD>˰<EFBFBD><CBB0><EFBFBD><EFBFBD><EFBFBD>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
+"  --version      <20><>ʾ pg_controldata <20>İ汾, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
 
-#: pg_controldata.c:30
+#: pg_controldata.c:41
 msgid ""
-"If not data directory is specified, the environment variable PGDATA\n"
+"\n"
+"If no data directory is specified, the environment variable PGDATA\n"
 "is used.\n"
 "\n"
 msgstr ""
+"\n"
 "<22><><EFBFBD><EFBFBD>û<EFBFBD><C3BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ¼, <20><>ʹ<EFBFBD><CAB9>\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>PGDATA.\n"
 "\n"
 
-#: pg_controldata.c:31
+#: pg_controldata.c:42
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_controldata.c:41
+#: pg_controldata.c:52
 msgid "starting up"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
-#: pg_controldata.c:43
+#: pg_controldata.c:54
 msgid "shut down"
 msgstr "<22>ر<EFBFBD>"
 
-#: pg_controldata.c:45
+#: pg_controldata.c:56
 msgid "shutting down"
 msgstr "<22><><EFBFBD>ڹر<DAB9>"
 
-#: pg_controldata.c:47
+#: pg_controldata.c:58
 msgid "in recovery"
 msgstr "<22>ڻָ<DABB><D6B8><EFBFBD>"
 
-#: pg_controldata.c:49
+#: pg_controldata.c:60
 msgid "in production"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
-#: pg_controldata.c:51
+#: pg_controldata.c:62
 msgid "unrecognized status code"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>Ͽɵ<CFBF>״̬<D7B4><CCAC>"
 
-#: pg_controldata.c:99
+#: pg_controldata.c:107
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: û<><C3BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ¼\n"
 
-#: pg_controldata.c:107
+#: pg_controldata.c:108
 #, c-format
-msgid "%s: could not open file \"%s\" for reading (%s)\n"
+msgid "Try \"%s --help\" for more information.\n"
-msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> \"%s\" <20><>ȡ<EFBFBD><C8A1>Ϣ (%s)\n"
+msgstr "<EFBFBD><EFBFBD> \"%s --help\" <20><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ.\n"
 
-#: pg_controldata.c:114
+#: pg_controldata.c:116
 #, c-format
-msgid "%s: could not read file \"%s\" (%s)\n"
+msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD>ļ<EFBFBD> \"%s\" (%s)\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> \"%s\" <EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>Ϣ: %s\n"
 
-#: pg_controldata.c:128
+#: pg_controldata.c:123
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
+
+#: pg_controldata.c:137
 msgid ""
 "WARNING: Calculated CRC checksum does not match value stored in file.\n"
 "Either the file is corrupt, or it has a different layout than this program\n"
@@ -93,120 +113,120 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD><EFBFBD>Ľ<EFBFBD><C4BD><EFBFBD><EFBFBD>Dz<EFBFBD><C7B2>ɿ<EFBFBD><C9BF><EFBFBD>.\n"
 "\n"
 
-#: pg_controldata.c:141
+#: pg_controldata.c:150
 #, c-format
 msgid "pg_control version number:            %u\n"
-msgstr "pg_control <20>汾:            %u\n"
+msgstr "pg_control <20>汾:                      %u\n"
-
-#: pg_controldata.c:142
-#, c-format
-msgid "Catalog version number:               %u\n"
-msgstr "Catalog <20>汾:               %u\n"
-
-#: pg_controldata.c:143
-#, c-format
-msgid "Database cluster state:               %s\n"
-msgstr "<22><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>״̬:               %s\n"
-
-#: pg_controldata.c:144
-#, c-format
-msgid "pg_control last modified:             %s\n"
-msgstr "pg_control <20><><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD>:             %s\n"
-
-#: pg_controldata.c:145
-#, c-format
-msgid "Current log file ID:                  %u\n"
-msgstr "<22><>ǰ<EFBFBD><C7B0>־<EFBFBD>ļ<EFBFBD>ID:                  %u\n"
-
-#: pg_controldata.c:146
-#, c-format
-msgid "Next log file segment:                %u\n"
-msgstr "<22><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>־<EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>:                %u\n"
-
-#: pg_controldata.c:147
-#, c-format
-msgid "Latest checkpoint location:           %X/%X\n"
-msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB>:           %X/%X\n"
-
-#: pg_controldata.c:149
-#, c-format
-msgid "Prior checkpoint location:            %X/%X\n"
-msgstr "<22><><EFBFBD>ȼ<EFBFBD><C8BC><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB>:            %X/%X\n"
 
 #: pg_controldata.c:151
 #, c-format
-msgid "Latest checkpoint's REDO location:    %X/%X\n"
+msgid "Catalog version number:               %u\n"
-msgstr "<EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> REDO λ<><CEBB>:    %X/%X\n"
+msgstr "Catalog <20>汾:                         %u\n"
+
+#: pg_controldata.c:152
+#, c-format
+msgid "Database cluster state:               %s\n"
+msgstr "<22><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>״̬:                         %s\n"
 
 #: pg_controldata.c:153
 #, c-format
-msgid "Latest checkpoint's UNDO location:    %X/%X\n"
+msgid "pg_control last modified:             %s\n"
-msgstr "<22><><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> UNDO λ<><CEBB>:    %X/%X\n"
+msgstr "pg_control <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD>:                  %s\n"
+
+#: pg_controldata.c:154
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "<22><>ǰ<EFBFBD><C7B0>־<EFBFBD>ļ<EFBFBD>ID:                       %u\n"
 
 #: pg_controldata.c:155
 #, c-format
-msgid "Latest checkpoint's StartUpID:        %u\n"
+msgid "Next log file segment:                %u\n"
-msgstr "<22><><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> StartUpID:        %u\n"
+msgstr "<22><>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD>:                     %u\n"
 
 #: pg_controldata.c:156
 #, c-format
-msgid "Latest checkpoint's NextXID:          %u\n"
+msgid "Latest checkpoint location:           %X/%X\n"
-msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextXID:          %u\n"
+msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD>:                       %X/%X\n"
-
-#: pg_controldata.c:157
-#, c-format
-msgid "Latest checkpoint's NextOID:          %u\n"
-msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextOID:          %u\n"
 
 #: pg_controldata.c:158
 #, c-format
-msgid "Time of latest checkpoint:            %s\n"
+msgid "Prior checkpoint location:            %X/%X\n"
-msgstr "<22><><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>:            %s\n"
+msgstr "<22><><EFBFBD>ȼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD>:                       %X/%X\n"
-
-#: pg_controldata.c:159
-#, c-format
-msgid "Database block size:                  %u\n"
-msgstr "<22><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>С:                  %u\n"
 
 #: pg_controldata.c:160
 #, c-format
-msgid "Blocks per segment of large relation: %u\n"
+msgid "Latest checkpoint's REDO location:    %X/%X\n"
-msgstr "<22><><EFBFBD><EFBFBD>ϵ<EFBFBD><EFBFBD>ÿ<EFBFBD>ο<EFBFBD><EFBFBD><EFBFBD>: %u\n"
+msgstr "<22><><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> REDO λ<><CEBB>:               %X/%X\n"
-
-#: pg_controldata.c:161
-#, c-format
-msgid "Maximum length of identifiers:        %u\n"
-msgstr "<22><>ʶ<EFBFBD><CAB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󳤶<EFBFBD>:        %u\n"
 
 #: pg_controldata.c:162
 #, c-format
-msgid "Maximum number of function arguments: %u\n"
+msgid "Latest checkpoint's UNDO location:    %X/%X\n"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %u\n"
+msgstr "<22><><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> UNDO λ<><CEBB>:               %X/%X\n"
 
-#: pg_controldata.c:163
+#: pg_controldata.c:164
 #, c-format
-msgid "Date/time type storage:               %s\n"
+msgid "Latest checkpoint's StartUpID:        %u\n"
-msgstr "<22><><EFBFBD><EFBFBD>/ʱ<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>ʹ洢:               %s\n"
+msgstr "<22><><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> StartUpID:               %u\n"
-
-#: pg_controldata.c:164
-msgid "64-bit integers"
-msgstr "64λ<34><CEBB><EFBFBD><EFBFBD>"
-
-#: pg_controldata.c:164
-msgid "Floating point"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #: pg_controldata.c:165
 #, c-format
-msgid "Maximum length of locale name:        %u\n"
+msgid "Latest checkpoint's NextXID:          %u\n"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>󳤶<EFBFBD>:        %u\n"
+msgstr "<22><><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextXID:                 %u\n"
 
 #: pg_controldata.c:166
 #, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextOID:                 %u\n"
+
+#: pg_controldata.c:167
+#, c-format
+msgid "Time of latest checkpoint:            %s\n"
+msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>:                     %s\n"
+
+#: pg_controldata.c:168
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "<22><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>С:                         %u\n"
+
+#: pg_controldata.c:169
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "<22><><EFBFBD><EFBFBD>ϵ<EFBFBD><CFB5>ÿ<EFBFBD>ο<EFBFBD><CEBF><EFBFBD>:                     %u\n"
+
+#: pg_controldata.c:170
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "<22><>ʶ<EFBFBD><CAB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󳤶<EFBFBD>:                     %u\n"
+
+#: pg_controldata.c:171
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:                   %u\n"
+
+#: pg_controldata.c:172
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "<22><><EFBFBD><EFBFBD>/ʱ<><CAB1> <20><><EFBFBD>ʹ洢:                   %s\n"
+
+#: pg_controldata.c:173
+msgid "64-bit integers"
+msgstr "64λ<34><CEBB><EFBFBD><EFBFBD>"
+
+#: pg_controldata.c:173
+msgid "floating-point numbers"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+#: pg_controldata.c:174
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD>󳤶<EFBFBD>:                   %u\n"
+
+#: pg_controldata.c:175
+#, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_controldata.c:167
+#: pg_controldata.c:176
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"

src/bin/pg_resetxlog/po/zh_CN.po

@@ -3,9 +3,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.3\n"
+"Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2002-09-27 13:41+0800\n"
+"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2002-09-19 16:43+0800\n"
+"POT-Creation-Date: 2003-08-05 22:13+0000\n"
+"PO-Revision-Date: 2003-09-15 13:47+0800\n"
 "Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
 "Language-Team: Bao Wei <bao_paul@yahoo.com.cn>\n"
 "MIME-Version: 1.0\n"
@@ -14,39 +15,55 @@ msgstr ""
 
 #: pg_resetxlog.c:141
 #, c-format
+msgid "%s: invalid argument for option -x\n"
+msgstr "%s: Ϊ -x ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>\n"
+
+#: pg_resetxlog.c:142 pg_resetxlog.c:157 pg_resetxlog.c:172 pg_resetxlog.c:179
+#: pg_resetxlog.c:185 pg_resetxlog.c:193
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "<22><><EFBFBD><EFBFBD> \"%s --help\" <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ.\n"
+
+#: pg_resetxlog.c:147
+#, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD> ID (-x) <20><><EFBFBD><EFBFBD>Ϊ 0\n"
 
-#: pg_resetxlog.c:149
+#: pg_resetxlog.c:156
 #, c-format
-msgid "%s: invalid argument for -l option\n"
+msgid "%s: invalid argument for option -o\n"
+msgstr "%s: Ϊ -o ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>\n"
+
+#: pg_resetxlog.c:162
+#, c-format
+msgid "%s: OID (-o) must not be 0\n"
+msgstr "%s: OID (-o) <20><><EFBFBD><EFBFBD>Ϊ 0\n"
+
+#: pg_resetxlog.c:171 pg_resetxlog.c:178
+#, c-format
+msgid "%s: invalid argument for option -l\n"
 msgstr "%s: Ϊ -l ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:150 pg_resetxlog.c:156 pg_resetxlog.c:164
+#: pg_resetxlog.c:192
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "<22><><EFBFBD><EFBFBD> '%s --help' <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ.\n"
-
-#: pg_resetxlog.c:163
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: û<><C3BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ¼\n"
 
-#: pg_resetxlog.c:183 pg_resetxlog.c:273
+#: pg_resetxlog.c:212 pg_resetxlog.c:308
 #, c-format
-msgid "%s: could not open %s for reading: %s\n"
+msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> %s <20><>ȡ<EFBFBD><C8A1>Ϣ: %s\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> \"%s\" <20><>ȡ<EFBFBD><C8A1>Ϣ: %s\n"
 
-#: pg_resetxlog.c:189
+#: pg_resetxlog.c:218
 #, c-format
 msgid ""
-"%s: lock file %s exists\n"
+"%s: lock file \"%s\" exists\n"
-"Is a server running? If not, delete the lock file and try again.\n"
+"Is a server running?  If not, delete the lock file and try again.\n"
 msgstr ""
-"%s: <20><><EFBFBD>ļ<EFBFBD> %s <20>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD>\n"
+"%s: <20><><EFBFBD>ļ<EFBFBD> \"%s\" <20>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD>\n"
 "<22>Ƿ<EFBFBD><C7B7><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>? <20><><EFBFBD><EFBFBD>û<EFBFBD><C3BB>, ɾ<><C9BE><EFBFBD>Ǹ<EFBFBD><C7B8><EFBFBD><EFBFBD>ļ<EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>.\n"
 
-#: pg_resetxlog.c:210
+#: pg_resetxlog.c:257
 msgid ""
 "\n"
 "If these values seem acceptable, use -f to force reset.\n"
@@ -54,7 +71,7 @@ msgstr ""
 "\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Щֵ<D0A9>ɽ<EFBFBD><C9BD><EFBFBD>, <20><> -f ǿ<><C7BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
 
-#: pg_resetxlog.c:222
+#: pg_resetxlog.c:269
 msgid ""
 "The database server was not shut down cleanly.\n"
 "Resetting the transaction log may cause data to be lost.\n"
@@ -64,14 +81,14 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD>п<EFBFBD><D0BF>ܻ<EFBFBD><DCBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7><EFBFBD><EFBFBD>.\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> -f ǿ<><C7BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
 
-#: pg_resetxlog.c:247
+#: pg_resetxlog.c:282
 msgid "Transaction log reset\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><D6BE><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:276
+#: pg_resetxlog.c:311
 #, c-format
 msgid ""
-"If you are sure the data directory path is correct, do\n"
+"If you are sure the data directory path is correct, execute\n"
 "  touch %s\n"
 "and try again.\n"
 msgstr ""
@@ -79,32 +96,32 @@ msgstr ""
 "  touch %s\n"
 "Ȼ<><C8BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>.\n"
 
-#: pg_resetxlog.c:289
+#: pg_resetxlog.c:324
 #, c-format
-msgid "%s: could not read %s: %s\n"
+msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD>ȡ %s: %s\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
 
-#: pg_resetxlog.c:312
+#: pg_resetxlog.c:347
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
 msgstr "%s: pg_control <20>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>CRC; <20><><EFBFBD>о<EFBFBD><D0BE><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:321
+#: pg_resetxlog.c:356
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
 msgstr "%s: pg_control <20>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD>ƻ<EFBFBD><C6BB><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD>汾; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:363
+#: pg_resetxlog.c:407
 #, c-format
 msgid "%s: invalid LC_COLLATE setting\n"
 msgstr "%s: <20><>Ч<EFBFBD><D0A7> LC_COLLATE <20><><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:370
+#: pg_resetxlog.c:414
 #, c-format
 msgid "%s: invalid LC_CTYPE setting\n"
 msgstr "%s: <20><>Ч<EFBFBD><D0A7> LC_CTYPE <20><><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:392
+#: pg_resetxlog.c:436
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
@@ -112,7 +129,7 @@ msgstr ""
 "<22>²<EFBFBD><C2B2><EFBFBD> pg_control ֵ:\n"
 "\n"
 
-#: pg_resetxlog.c:394
+#: pg_resetxlog.c:438
 msgid ""
 "pg_control values:\n"
 "\n"
@@ -120,108 +137,136 @@ msgstr ""
 "pg_control ֵ:\n"
 "\n"
 
-#: pg_resetxlog.c:396
+#: pg_resetxlog.c:440
 #, c-format
 msgid "pg_control version number:            %u\n"
-msgstr "pg_control <20>汾:            %u\n"
+msgstr "pg_control <20>汾:                      %u\n"
 
-#: pg_resetxlog.c:397
+#: pg_resetxlog.c:441
 #, c-format
 msgid "Catalog version number:               %u\n"
-msgstr "Catalog <20>汾:               %u\n"
+msgstr "Catalog <20>汾:                         %u\n"
 
-#: pg_resetxlog.c:398
+#: pg_resetxlog.c:442
 #, c-format
 msgid "Current log file ID:                  %u\n"
-msgstr "<22><>ǰ<EFBFBD><C7B0>־<EFBFBD>ļ<EFBFBD>ID:                  %u\n"
+msgstr "<22><>ǰ<EFBFBD><C7B0>־<EFBFBD>ļ<EFBFBD>ID:                       %u\n"
 
-#: pg_resetxlog.c:399
+#: pg_resetxlog.c:443
 #, c-format
 msgid "Next log file segment:                %u\n"
-msgstr "<22><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>־<EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>:                %u\n"
+msgstr "<22><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>־<EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>:                     %u\n"
 
-#: pg_resetxlog.c:400
+#: pg_resetxlog.c:444
 #, c-format
 msgid "Latest checkpoint's StartUpID:        %u\n"
-msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> StartUpID:        %u\n"
+msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> StartUpID:               %u\n"
 
-#: pg_resetxlog.c:401
+#: pg_resetxlog.c:445
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
-msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextXID:          %u\n"
+msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextXID:                 %u\n"
 
-#: pg_resetxlog.c:402
+#: pg_resetxlog.c:446
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
-msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextOID:          %u\n"
+msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextOID:                 %u\n"
 
-#: pg_resetxlog.c:403
+#: pg_resetxlog.c:447
 #, c-format
 msgid "Database block size:                  %u\n"
-msgstr "<22><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>С:                  %u\n"
+msgstr "<22><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>С:                         %u\n"
 
-#: pg_resetxlog.c:404
+#: pg_resetxlog.c:448
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
-msgstr "<22><><EFBFBD><EFBFBD>ϵ<EFBFBD><CFB5>ÿ<EFBFBD>ο<EFBFBD><CEBF><EFBFBD>: %u\n"
+msgstr "<22><><EFBFBD><EFBFBD>ϵ<EFBFBD><CFB5>ÿ<EFBFBD>ο<EFBFBD><CEBF><EFBFBD>:                     %u\n"
 
-#: pg_resetxlog.c:405
+#: pg_resetxlog.c:449
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "<22><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󳤶<EFBFBD>:                     %u\n"
+
+#: pg_resetxlog.c:450
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:                   %u\n"
+
+#: pg_resetxlog.c:451
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "<22><><EFBFBD><EFBFBD>/ʱ<><CAB1><EFBFBD><EFBFBD><EFBFBD>ʹ洢:                    %s\n"
+
+#: pg_resetxlog.c:452
+msgid "64-bit integers"
+msgstr "64λ<34><CEBB><EFBFBD><EFBFBD>"
+
+#: pg_resetxlog.c:452
+msgid "floating-point numbers"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+#: pg_resetxlog.c:453
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD>󳤶<EFBFBD>:                   %u\n"
+
+#: pg_resetxlog.c:454
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_resetxlog.c:406
+#: pg_resetxlog.c:455
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
 
-#: pg_resetxlog.c:459
+#: pg_resetxlog.c:508
 #, c-format
 msgid ""
 "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
 msgstr "%s: <20>ڲ<EFBFBD><DAB2><EFBFBD><EFBFBD><EFBFBD> -- sizeof(ControlFileData) ̫<><CCAB> ... <20>޸<EFBFBD> xlog.c\n"
 
-#: pg_resetxlog.c:472
+#: pg_resetxlog.c:521
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> pg_control <20>ļ<EFBFBD>: %s\n"
 
-#: pg_resetxlog.c:483
+#: pg_resetxlog.c:532
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s: <20>޷<EFBFBD>д pg_control <20>ļ<EFBFBD>: %s\n"
 
-#: pg_resetxlog.c:490 pg_resetxlog.c:631
+#: pg_resetxlog.c:539 pg_resetxlog.c:680
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: fsync <20><><EFBFBD><EFBFBD>: %s\n"
 
-#: pg_resetxlog.c:511
+#: pg_resetxlog.c:560
 #, c-format
-msgid "%s: could not open directory %s: %s\n"
+msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>Ŀ¼ %s: %s\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>Ŀ¼ \"%s\": %s\n"
 
-#: pg_resetxlog.c:525
+#: pg_resetxlog.c:574
 #, c-format
-msgid "%s: could not delete file %s: %s\n"
+msgid "%s: could not delete file \"%s\": %s\n"
-msgstr "%s: <20>޷<EFBFBD>ɾ<EFBFBD><C9BE><EFBFBD>ļ<EFBFBD> %s: %s\n"
+msgstr "%s: <20>޷<EFBFBD>ɾ<EFBFBD><C9BE><EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
 
-#: pg_resetxlog.c:535
+#: pg_resetxlog.c:584
 #, c-format
-msgid "%s: could not read from directory %s: %s\n"
+msgid "%s: could not read from directory \"%s\": %s\n"
-msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD>Ŀ¼ %s <20>ж<EFBFBD>ȡ: %s\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD>Ŀ¼ \"%s\" <20>ж<EFBFBD>ȡ: %s\n"
 
-#: pg_resetxlog.c:598
+#: pg_resetxlog.c:647
 #, c-format
-msgid "%s: could not open %s: %s\n"
+msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> %s: %s\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
 
-#: pg_resetxlog.c:609 pg_resetxlog.c:623
+#: pg_resetxlog.c:658 pg_resetxlog.c:672
 #, c-format
-msgid "%s: could not write %s: %s\n"
+msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s: <20>޷<EFBFBD>д %s: %s\n"
+msgstr "%s: <20>޷<EFBFBD>д<EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
 
-#: pg_resetxlog.c:642
+#: pg_resetxlog.c:691
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
@@ -230,45 +275,63 @@ msgstr ""
 "%s <20><><EFBFBD><EFBFBD> PostgreSQL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־.\n"
 "\n"
 
-#: pg_resetxlog.c:643
+#: pg_resetxlog.c:692
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [OPTIONS] DATADIR\n"
+"  %s [OPTION]... DATADIR\n"
 "\n"
 msgstr ""
 "ʹ<>÷<EFBFBD><C3B7><EFBFBD>:\n"
-"  %s [ѡ<><D1A1>] <20><><EFBFBD><EFBFBD>Ŀ¼\n"
+"  %s [ѡ<><D1A1>]... <20><><EFBFBD><EFBFBD>Ŀ¼\n"
 "\n"
 
-#: pg_resetxlog.c:644
+#: pg_resetxlog.c:693
 msgid "Options:\n"
 msgstr "ѡ<><D1A1>:\n"
 
-#: pg_resetxlog.c:645
+#: pg_resetxlog.c:694
-msgid "  -f                force update to be done\n"
+msgid "  -f              force update to be done\n"
 msgstr "  -f                ǿ<>Ƹ<EFBFBD><C6B8><EFBFBD>\n"
 
-#: pg_resetxlog.c:646
+#: pg_resetxlog.c:695
 msgid ""
-"  -l FILEID,SEG     force minimum WAL starting location for new transaction "
+"  -l FILEID,SEG   force minimum WAL starting location for new transaction "
 "log\n"
 msgstr "  -l FILEID,SEG     <20><><EFBFBD>µ<EFBFBD><C2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><D6BE>ǿ<EFBFBD><C7BF><EFBFBD><EFBFBD>С WAL <20><>ʼλ<CABC><CEBB>\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:696
 msgid ""
-"  -n                no update, just show extracted control values (for "
+"  -n              no update, just show extracted control values (for "
 "testing)\n"
 msgstr "  -n                δ<><CEB4><EFBFBD><EFBFBD>, ֻ<><D6BB>ʾ<EFBFBD><CABE>ȡ<EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD>ֵ (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;)\n"
 
-#: pg_resetxlog.c:648
+#: pg_resetxlog.c:697
-msgid "  -x XID            set next transaction ID\n"
+msgid "  -o OID          set next OID\n"
+msgstr "  -o OID            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB> OID\n"
+
+#: pg_resetxlog.c:698
+msgid "  -x XID          set next transaction ID\n"
 msgstr "  -x XID            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ID\n"
 
-#: pg_resetxlog.c:649
+#: pg_resetxlog.c:699
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help            <20><>ʾ<EFBFBD>˰<EFBFBD><CBB0><EFBFBD><EFBFBD><EFBFBD>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
+
+#: pg_resetxlog.c:700
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version         <20><><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD><E6B1BE>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
+
+#: pg_resetxlog.c:701
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <pgsql-bugs@postgresql.org>.\n"
+
+#~ msgid "%s: invalid argument for -x option\n"
+#~ msgstr "%s: Ϊ -x ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>\n"
+
+#~ msgid "%s: invalid argument for -o option\n"
+#~ msgstr "%s: Ϊ -o ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>\n"

src/bin/scripts/nls.mk

@@ -1,6 +1,6 @@
-# $Header: /cvsroot/pgsql/src/bin/scripts/nls.mk,v 1.6 2003/08/11 15:19:58 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/scripts/nls.mk,v 1.7 2003/09/15 20:41:59 petere Exp $
 CATALOG_NAME    := pgscripts
-AVAIL_LANGUAGES := cs de ru sv
+AVAIL_LANGUAGES := cs de ru sv zh_CN
 GETTEXT_FILES   := createdb.c createlang.c createuser.c \
                    dropdb.c droplang.c dropuser.c \
                    clusterdb.c vacuumdb.c \

src/bin/scripts/po/zh_CN.po

@@ -0,0 +1,605 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-05 22:14+0000\n"
+"PO-Revision-Date: 2003-09-15 21:03+0000\n"
+"Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: createdb.c:101 createdb.c:120 createlang.c:94 createlang.c:115
+#: createlang.c:157 createuser.c:116 createuser.c:131 dropdb.c:83 dropdb.c:92
+#: dropdb.c:100 droplang.c:88 droplang.c:109 droplang.c:151 dropuser.c:83
+#: dropuser.c:98 clusterdb.c:96 clusterdb.c:111 vacuumdb.c:112 vacuumdb.c:127
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "<22><><EFBFBD><EFBFBD> \"%s --help\" <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ.\n"
+
+#: createdb.c:118 createlang.c:113 createuser.c:129 dropdb.c:98 droplang.c:107
+#: dropuser.c:96 clusterdb.c:109 vacuumdb.c:125
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: ̫<><CCAB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><D0B2><EFBFBD> (<28><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD> \"%s\")\n"
+
+#: createdb.c:128
+#, c-format
+msgid "%s: \"%s\" is not a valid encoding name\n"
+msgstr "%s: \"%s\" <20><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>Ч<EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+
+#: createdb.c:170
+#, c-format
+msgid "%s: database creation failed: %s"
+msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>ʧ<EFBFBD><CAA7>: %s"
+
+#: createdb.c:195
+#, c-format
+msgid "%s: comment creation failed (database was created): %s"
+msgstr "%s: <20><><EFBFBD><EFBFBD>ע<EFBFBD><D7A2>ʧ<EFBFBD><CAA7> (<28><><EFBFBD>ݿ<EFBFBD><DDBF>Ѵ<EFBFBD><D1B4><EFBFBD>): %s"
+
+#: createdb.c:213
+#, c-format
+msgid ""
+"%s creates a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s <20><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB> PostgreSQL <20><><EFBFBD>ݿ<EFBFBD>.\n"
+"\n"
+
+#: createdb.c:214 createlang.c:272 createuser.c:236 dropdb.c:143
+#: droplang.c:242 dropuser.c:143 clusterdb.c:232 vacuumdb.c:256
+msgid "Usage:\n"
+msgstr "ʹ<>÷<EFBFBD><C3B7><EFBFBD>:\n"
+
+#: createdb.c:215
+#, c-format
+msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
+msgstr "  %s [ѡ<><D1A1>]... [<5B><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>] [<5B><><EFBFBD><EFBFBD>]\n"
+
+#: createdb.c:216 createlang.c:274 createuser.c:238 dropdb.c:145
+#: droplang.c:244 dropuser.c:145 clusterdb.c:234 vacuumdb.c:258
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"ѡ<><D1A1>:\n"
+
+#: createdb.c:217
+msgid "  -D, --location=PATH       alternative place to store the database\n"
+msgstr "  -D, --location=PATH       ѡ<><D1A1>һ<EFBFBD><D2BB><EFBFBD>ط<EFBFBD><D8B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>\n"
+
+#: createdb.c:218
+msgid "  -E, --encoding=ENCODING   encoding for the database\n"
+msgstr "  -E, --encoding=ENCODING   <20><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>\n"
+
+#: createdb.c:219
+msgid "  -O, --owner=OWNER         database user to own the new database\n"
+msgstr "  -O, --owner=OWNER         <20><><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>\n"
+
+#: createdb.c:220
+msgid "  -T, --template=TEMPLATE   template database to copy\n"
+msgstr "  -T, --template=TEMPLATE   Ҫ<><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>ģ<EFBFBD><C4A3>\n"
+
+#: createdb.c:221 createlang.c:276 createuser.c:247 dropdb.c:146
+#: droplang.c:246 dropuser.c:146 clusterdb.c:238
+msgid ""
+"  -e, --echo                show the commands being sent to the server\n"
+msgstr ""
+"  -e, --echo                <20><>ʾ<EFBFBD><CABE><EFBFBD>͵<EFBFBD><CDB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˵<EFBFBD><CBB5><EFBFBD><EFBFBD><EFBFBD>\n"
+
+#: createdb.c:222 createuser.c:248 dropdb.c:148 dropuser.c:148 clusterdb.c:239
+msgid "  -q, --quiet               don't write any messages\n"
+msgstr "  -q, --quiet               <20><>д<EFBFBD>κ<EFBFBD><CEBA><EFBFBD>Ϣ\n"
+
+#: createdb.c:223 createlang.c:283 createuser.c:249 dropdb.c:153
+#: droplang.c:252 dropuser.c:153 clusterdb.c:240
+msgid "  --help                    show this help, then exit\n"
+msgstr "  --help                    <20><>ʾ<EFBFBD>˰<EFBFBD><CBB0><EFBFBD><EFBFBD><EFBFBD>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
+
+#: createdb.c:224 createlang.c:284 createuser.c:250 dropdb.c:154
+#: droplang.c:253 dropuser.c:154 clusterdb.c:241
+msgid "  --version                 output version information, then exit\n"
+msgstr "  --version                 <20><><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD><E6B1BE>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
+
+#: createdb.c:225 createuser.c:251 clusterdb.c:242 vacuumdb.c:269
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"<22><><EFBFBD><EFBFBD>ѡ<EFBFBD><D1A1>:\n"
+
+#: createdb.c:226 createlang.c:279 createuser.c:252 dropdb.c:149
+#: droplang.c:248 dropuser.c:149 clusterdb.c:243 vacuumdb.c:270
+msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
+msgstr "  -h, --host=HOSTNAM        <20><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڻ<EFBFBD><DABB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׽<EFBFBD><D7BD><EFBFBD>Ŀ¼\n"
+
+#: createdb.c:227 createlang.c:280 createuser.c:253 dropdb.c:150
+#: droplang.c:249 dropuser.c:150 clusterdb.c:244 vacuumdb.c:271
+msgid "  -p, --port=PORT           database server port\n"
+msgstr "  -p, --port=PORT           <20><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˿ں<CBBF>\n"
+
+#: createdb.c:228 createlang.c:281 dropdb.c:151 droplang.c:250 clusterdb.c:245
+#: vacuumdb.c:272
+msgid "  -U, --username=USERNAME   user name to connect as\n"
+msgstr "  -U, --username=USERNAME   <20><><EFBFBD>ӵ<EFBFBD><D3B5>û<EFBFBD><C3BB><EFBFBD>\n"
+
+#: createdb.c:229 createlang.c:282 dropdb.c:152 droplang.c:251 clusterdb.c:246
+#: vacuumdb.c:273
+msgid "  -W, --password            prompt for password\n"
+msgstr "  -W, --password            <20><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+
+#: createdb.c:230
+msgid ""
+"\n"
+"By default, a database with the same name as the current user is created.\n"
+msgstr ""
+"\n"
+"Ĭ<><C4AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20>Ե<EFBFBD>ǰ<EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>.\n"
+
+#: createdb.c:231 createlang.c:285 createuser.c:258 dropdb.c:155
+#: droplang.c:254 dropuser.c:155 clusterdb.c:248 vacuumdb.c:275
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"<22><><EFBFBD>汨<EFBFBD><E6B1A8><EFBFBD><EFBFBD> <pgsql-bugs@postgresql.org>.\n"
+
+#: createlang.c:140 droplang.c:134
+msgid "Name"
+msgstr "<22><><EFBFBD><EFBFBD>"
+
+#: createlang.c:140 droplang.c:134
+msgid "yes"
+msgstr "yes"
+
+#: createlang.c:140 droplang.c:134
+msgid "no"
+msgstr "no"
+
+#: createlang.c:140 droplang.c:134
+msgid "Trusted?"
+msgstr "<22>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD>?"
+
+#: createlang.c:147 droplang.c:141
+msgid "Procedural Languages"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+#: createlang.c:156 droplang.c:150
+#, c-format
+msgid "%s: missing required argument language name\n"
+msgstr "%s: ȱ<><C8B1>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʋ<EFBFBD><C6B2><EFBFBD>\n"
+
+#: createlang.c:206
+#, c-format
+msgid "%s: unsupported language \"%s\"\n"
+msgstr "%s: <20><>֧<EFBFBD><D6A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\"\n"
+
+#: createlang.c:207
+msgid ""
+"Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
+"plpythonu.\n"
+msgstr "<22><>֧<EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> plpgsql, pltcl, pltclu, plperl, plperlu, <20><> plpythonu.\n"
+
+#: createlang.c:222
+#, c-format
+msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
+msgstr "%1$s: <20><><EFBFBD>ݿ<EFBFBD> \"%3$s\" <20><><EFBFBD>Ѿ<EFBFBD><D1BE><EFBFBD>װ<EFBFBD><D7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%2$s\"\n"
+
+#: createlang.c:256
+#, c-format
+msgid "%s: language installation failed: %s"
+msgstr "%s: <20><><EFBFBD>԰<EFBFBD>װʧ<D7B0><CAA7>: %s"
+
+#: createlang.c:271
+#, c-format
+msgid ""
+"%s installs a procedural language into a PostgreSQL database.\n"
+"\n"
+msgstr "%s <20><>װһ<D7B0><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Խ<EFBFBD> PostgreSQL <20><><EFBFBD>ݿ<EFBFBD>.\n\n"
+
+#: createlang.c:273 droplang.c:243
+#, c-format
+msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
+msgstr "  %s [ѡ<><D1A1>]... <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [<5B><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>]\n"
+
+#: createlang.c:275
+msgid "  -d, --dbname=DBNAME       database to install language in\n"
+msgstr "  -d, --dbname=DBNAME       Ҫ<><D2AA>װ<EFBFBD><D7B0><EFBFBD>Ե<EFBFBD><D4B5><EFBFBD><EFBFBD>ݿ<EFBFBD>\n"
+
+#: createlang.c:277 droplang.c:247
+msgid ""
+"  -l, --list                show a list of currently installed languages\n"
+msgstr ""
+"  -l, --list                <20><>ʾ<EFBFBD><CABE>ǰ<EFBFBD>Ѿ<EFBFBD><D1BE><EFBFBD>װ<EFBFBD>˵<EFBFBD><CBB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>б<EFBFBD>\n"
+
+#: createlang.c:278
+msgid ""
+"  -L, --pglib=DIRECTORY     find language interpreter file in DIRECTORY\n"
+msgstr ""
+"  -L, --pglib=DIRECTORY     <20><> DIRECTORY Ŀ¼<C4BF>в<EFBFBD><D0B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD>ļ<EFBFBD>\n"
+
+#: createuser.c:141
+#, c-format
+msgid "%s: user ID must be a positive number\n"
+msgstr "%s: <20>û<EFBFBD> ID <20><><EFBFBD><EFBFBD>Ϊһ<CEAA><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+
+#: createuser.c:147
+msgid "Enter name of user to add: "
+msgstr "<22><><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD>ӵ<EFBFBD><D3B5>û<EFBFBD><C3BB><EFBFBD>: "
+
+#: createuser.c:154
+msgid "Enter password for new user: "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB>Ŀ<EFBFBD><C4BF><EFBFBD>: "
+
+#: createuser.c:155
+msgid "Enter it again: "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>: "
+
+#: createuser.c:158
+msgid "Passwords didn't match.\n"
+msgstr "<22><><EFBFBD>ƥ<EEB2BB><C6A5>.\n"
+
+#: createuser.c:169
+msgid "Shall the new user be allowed to create databases? (y/n) "
+msgstr "<22><><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>? (y/n) "
+
+#: createuser.c:180
+msgid "Shall the new user be allowed to create more new users? (y/n) "
+msgstr "<22><><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>? (y/n) "
+
+#: createuser.c:219
+#, c-format
+msgid "%s: creation of new user failed: %s"
+msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>ʧ<EFBFBD><CAA7>: %s"
+
+#: createuser.c:235
+#, c-format
+msgid ""
+"%s creates a new PostgreSQL user.\n"
+"\n"
+msgstr ""
+"%s <20><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD>µ<EFBFBD> PostgreSQL <20>û<EFBFBD>.\n"
+"\n"
+
+#: createuser.c:237 dropuser.c:144
+#, c-format
+msgid "  %s [OPTION]... [USERNAME]\n"
+msgstr "  %s [ѡ<><D1A1>]... [<5B>û<EFBFBD><C3BB><EFBFBD>]\n"
+
+#: createuser.c:239
+msgid "  -a, --adduser             user can add new users\n"
+msgstr "  -a, --adduser             <20><><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>\n"
+
+#: createuser.c:240
+msgid "  -A, --no-adduser          user cannot add new users\n"
+msgstr "  -A, --no-adduser          <20><><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>\n"
+
+#: createuser.c:241
+msgid "  -d, --createdb            user can create new databases\n"
+msgstr "  -d, --createdb            <20><><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>\n"
+
+#: createuser.c:242
+msgid "  -D, --no-createdb         user cannot create databases\n"
+msgstr "  -D, --no-createdb         <20><><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>\n"
+
+#: createuser.c:243
+msgid "  -P, --pwprompt            assign a password to new user\n"
+msgstr "  -P, --pwprompt            <20><><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+
+#: createuser.c:244
+msgid "  -E, --encrypted           encrypt stored password\n"
+msgstr "  -E, --encrypted           <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܴ洢\n"
+
+#: createuser.c:245
+msgid "  -N, --unencrypted         do no encrypt stored password\n"
+msgstr "  -N, --unencrypted         <20><><EFBFBD><EFBFBD><EEB2BB><EFBFBD>ܴ洢\n"
+
+#: createuser.c:246
+msgid "  -i, --sysid=SYSID         select sysid for new user\n"
+msgstr "  -i, --sysid=SYSID         ѡ<><D1A1>һ<EFBFBD><D2BB> sysid <20><><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>\n"
+
+#: createuser.c:254
+msgid ""
+"  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
+msgstr ""
+"  -U, --username=USERNAME   <20><><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD> (<28><><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>)\n"
+
+#: createuser.c:255 dropuser.c:152
+msgid "  -W, --password            prompt for password to connect\n"
+msgstr "  -W, --password            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+
+#: createuser.c:256
+msgid ""
+"\n"
+"If one of -a, -A, -d, -D, and USERNAME is not specified, you will\n"
+"be prompted interactively.\n"
+msgstr ""
+"\n"
+"<22><><EFBFBD><EFBFBD> -a, -A, -d, -D, <20><> USERNAME һ<><D2BB><EFBFBD><EFBFBD>û<EFBFBD><C3BB>ָ<EFBFBD><D6B8>,<2C><>ʹ<EFBFBD>ý<EFBFBD><C3BD><EFBFBD>ʽ<EFBFBD><CABD>ʾ\n"
+"<22><>.\n"
+
+#: dropdb.c:91
+#, c-format
+msgid "%s: missing required argument database name\n"
+msgstr "%s: ȱ<><C8B1><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+
+#: dropdb.c:108
+#, c-format
+msgid "Database \"%s\" will be permanently removed.\n"
+msgstr "<22><><EFBFBD>ݿ<EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>õ<EFBFBD>ɾ<EFBFBD><C9BE>.\n"
+
+#: dropdb.c:109 dropuser.c:110
+msgid "Are you sure? (y/n) "
+msgstr "<22><>ȷ<EFBFBD><C8B7><EFBFBD><EFBFBD>? (y/n) "
+
+#: dropdb.c:126
+#, c-format
+msgid "%s: database removal failed: %s"
+msgstr "%s: <20><><EFBFBD>ݿ<EFBFBD>ɾ<EFBFBD><C9BE>ʧ<EFBFBD><CAA7>: %s"
+
+#: dropdb.c:142
+#, c-format
+msgid ""
+"%s removes a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s ɾ<><C9BE>һ<EFBFBD><D2BB> PostgreSQL <20><><EFBFBD>ݿ<EFBFBD>.\n"
+"\n"
+
+#: dropdb.c:144
+#, c-format
+msgid "  %s [OPTION]... DBNAME\n"
+msgstr "  %s [ѡ<><D1A1>]... <20><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>\n"
+
+#: dropdb.c:147 dropuser.c:147
+msgid "  -i, --interactive         prompt before deleting anything\n"
+msgstr "  -i, --interactive         ɾ<><C9BE><EFBFBD>κζ<CEBA><CEB6><EFBFBD>֮ǰ<D6AE><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʾ\n"
+
+#: droplang.c:170
+#, c-format
+msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
+msgstr "%1$s: <20><><EFBFBD>ݿ<EFBFBD> \"%3$s\" <20><>, û<>а<EFBFBD>װ<EFBFBD><D7B0><EFBFBD><EFBFBD> \"%2$s\"\n"
+
+#: droplang.c:186
+#, c-format
+msgid ""
+"%s: still %s functions declared in language \"%s\"; language not removed\n"
+msgstr "%s: <20><><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD><EFBFBD>δ<EFBFBD><CEB4>ɾ<EFBFBD><C9BE>\n"
+
+#: droplang.c:227
+#, c-format
+msgid "%s: language removal failed: %s"
+msgstr "%s: <20><><EFBFBD><EFBFBD>ɾ<EFBFBD><C9BE>ʧ<EFBFBD><CAA7>: %s"
+
+#: droplang.c:241
+#, c-format
+msgid ""
+"%s removes a procedural language from a database.\n"
+"\n"
+msgstr ""
+"%s <20><><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>ɾ<EFBFBD><C9BE>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
+"\n"
+
+#: droplang.c:245
+msgid ""
+"  -d, --dbname=DBNAME       database from which to remove the language\n"
+msgstr ""
+"  -d, --dbname=DBNAME       Ҫɾ<D2AA><C9BE><EFBFBD><EFBFBD><EFBFBD>Ե<EFBFBD><D4B5><EFBFBD><EFBFBD>ݿ<EFBFBD>\n"
+
+#: dropuser.c:103
+msgid "Enter name of user to drop: "
+msgstr "<22><><EFBFBD><EFBFBD>Ҫɾ<D2AA><C9BE><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>: "
+
+#: dropuser.c:109
+#, c-format
+msgid "User \"%s\" will be permanently removed.\n"
+msgstr "<22>û<EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><C9BE>.\n"
+
+#: dropuser.c:126
+#, c-format
+msgid "%s: removal of user \"%s\" failed: %s"
+msgstr "%s: ɾ<><C9BE><EFBFBD>û<EFBFBD> \"%s\" ʧ<><CAA7>: %s"
+
+#: dropuser.c:142
+#, c-format
+msgid ""
+"%s removes a PostgreSQL user.\n"
+"\n"
+msgstr ""
+"%s ɾ<><C9BE>һ<EFBFBD><D2BB> PostgreSQL <20>û<EFBFBD>.\n"
+"\n"
+
+#: dropuser.c:151
+msgid ""
+"  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
+msgstr ""
+"  -U, --username=USERNAME   <20><><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD> (<28><><EFBFBD><EFBFBD>Ҫɾ<D2AA><C9BE><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>)\n"
+
+#: clusterdb.c:119
+#, c-format
+msgid "%s: cannot cluster all databases and a specific one at the same time\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>һ<EFBFBD><D2BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>ͬʱ<CDAC><CAB1><EFBFBD><EFBFBD>\n"
+
+#: clusterdb.c:125
+#, c-format
+msgid "%s: cannot cluster a specific table in all databases\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF>ж<EFBFBD>һ<EFBFBD><D2BB>ָ<EFBFBD><D6B8><EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD>н<EFBFBD><D0BD><EFBFBD>\n"
+
+#: clusterdb.c:181
+#, c-format
+msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
+msgstr "%1$s: <20><><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> \"%3$s\" <20>еı<D0B5> \"%2$s\" <20><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>: %4$s"
+
+#: clusterdb.c:184
+#, c-format
+msgid "%s: clustering of database \"%s\" failed: %s"
+msgstr "%s: <20><><EFBFBD>ݿ<EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>: %s"
+
+#: clusterdb.c:217
+#, c-format
+msgid "%s: clustering database \"%s\"\n"
+msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> \"%s\" <20><><EFBFBD>н<EFBFBD><D0BD><EFBFBD>\n"
+
+#: clusterdb.c:231
+#, c-format
+msgid ""
+"%s clusters all previously clustered tables in a database.\n"
+"\n"
+msgstr ""
+"%s <20><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>صı<D8B5><C4B1><EFBFBD><EFBFBD>н<EFBFBD><D0BD><EFBFBD>.\n"
+"\n"
+
+#: clusterdb.c:233 vacuumdb.c:257
+#, c-format
+msgid "  %s [OPTION]... [DBNAME]\n"
+msgstr "  %s [ѡ<><D1A1>]... [<5B><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>]\n"
+
+#: clusterdb.c:235
+msgid "  -a, --all                 cluster all databases\n"
+msgstr "  -a, --all                 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ⽨<DDBF><E2BDA8>\n"
+
+#: clusterdb.c:236
+msgid "  -d, --dbname=DBNAME       database to cluster\n"
+msgstr "  -d, --dbname=DBNAME       <20><><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> DBNAME <20><><EFBFBD><EFBFBD>\n"
+
+#: clusterdb.c:237
+msgid "  -t, --table=TABLE         cluster specific table only\n"
+msgstr "  -t, --table=TABLE         ֻ<><D6BB>ָ<EFBFBD><D6B8><EFBFBD>ı<EFBFBD> TABLE <20><><EFBFBD><EFBFBD>\n"
+
+#: clusterdb.c:247
+msgid ""
+"\n"
+"Read the description of the SQL command CLUSTER for details.\n"
+msgstr ""
+"\n"
+"<22>Ķ<EFBFBD> SQL <20><><EFBFBD><EFBFBD> CLUSTER <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ, <20>Ա<EFBFBD><D4B1><EFBFBD><EFBFBD>ø<EFBFBD><C3B8><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>Ϣ.\n"
+
+#: vacuumdb.c:135
+#, c-format
+msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>һ<EFBFBD><D2BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>ͬʱ<CDAC><CAB1><EFBFBD><EFBFBD>\n"
+
+#: vacuumdb.c:141
+#, c-format
+msgid "%s: cannot vacuum a specific table in all databases\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF>ж<EFBFBD>һ<EFBFBD><D2BB>ָ<EFBFBD><D6B8><EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+
+#: vacuumdb.c:204
+#, c-format
+msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
+msgstr "%1$s: <20><><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> \"%3$s\" <20>еı<D0B5> \"%2$s\" <20><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>: %4$s"
+
+#: vacuumdb.c:207
+#, c-format
+msgid "%s: vacuuming of database \"%s\" failed: %s"
+msgstr "%s: <20><><EFBFBD>ݿ<EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>: %s"
+
+#: vacuumdb.c:241
+#, c-format
+msgid "%s: vacuuming database \"%s\"\n"
+msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> \"%s\"\n"
+
+#: vacuumdb.c:255
+#, c-format
+msgid ""
+"%s cleans and analyzes a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ż<EFBFBD>һ<EFBFBD><D2BB> PostgreSQL <20><><EFBFBD>ݿ<EFBFBD>.\n"
+"\n"
+
+#: vacuumdb.c:259
+msgid "  -a, --all                       vacuum all databases\n"
+msgstr "  -a, --all                       <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD>ݿ<EFBFBD>\n"
+
+#: vacuumdb.c:260
+msgid "  -d, --dbname=DBNAME             database to vacuum\n"
+msgstr "  -d, --dbname=DBNAME             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> DBNAME\n"
+
+#: vacuumdb.c:261
+msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
+msgstr "  -t, --table='TABLE[(COLUMNS)]'  ֻ<><D6BB><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD>ı<EFBFBD> TABLE\n"
+
+#: vacuumdb.c:262
+msgid "  -f, --full                      do full vacuuming\n"
+msgstr "  -f, --full                      <20><>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD>\n"
+
+#: vacuumdb.c:263
+msgid "  -z, --analyze                   update optimizer hints\n"
+msgstr "  -z, --anaylze                   <20><><EFBFBD><EFBFBD><EFBFBD>Ż<EFBFBD><C5BB><EFBFBD><EFBFBD><EFBFBD>Ϣ\n"
+
+#: vacuumdb.c:264
+msgid ""
+"  -e, --echo                      show the commands being sent to the "
+"server\n"
+msgstr ""
+"  -e, --echo                      <20><>ʾ<EFBFBD><CABE><EFBFBD>͵<EFBFBD><CDB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˵<EFBFBD><CBB5><EFBFBD><EFBFBD><EFBFBD>\n"
+
+#: vacuumdb.c:265
+msgid "  -q, --quiet                     don't write any messages\n"
+msgstr "  -q, --quiet                     <20><>д<EFBFBD>κ<EFBFBD><CEBA><EFBFBD>Ϣ\n"
+
+#: vacuumdb.c:266
+msgid "  -v, --verbose                   write a lot of output\n"
+msgstr "  -v, --verbose                   д<><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+
+#: vacuumdb.c:267
+msgid "  --help                          show this help, then exit\n"
+msgstr "  --help                          <20><>ʾ<EFBFBD>˰<EFBFBD><CBB0><EFBFBD><EFBFBD><EFBFBD>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
+
+#: vacuumdb.c:268
+msgid ""
+"  --version                       output version information, then exit\n"
+msgstr ""
+"  --versoin                       <20><><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD><E6B1BE>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
+
+#: vacuumdb.c:274
+msgid ""
+"\n"
+"Read the description of the SQL command VACUUM for details.\n"
+msgstr ""
+"\n"
+"<22>Ķ<EFBFBD> SQL <20><><EFBFBD><EFBFBD> VACUUM <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ, <20>Ա<EFBFBD><D4B1><EFBFBD><EFBFBD>ø<EFBFBD><C3B8><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>Ϣ.\n"
+
+#: common.c:88 common.c:114
+msgid "Password: "
+msgstr "<22><><EFBFBD><EFBFBD>: "
+
+#: common.c:101
+#, c-format
+msgid "%s: could not connect to database %s\n"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD>ӵ<EFBFBD><D3B5><EFBFBD><EFBFBD>ݿ<EFBFBD> %s\n"
+
+#: common.c:124
+#, c-format
+msgid "%s: could not connect to database %s: %s"
+msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD>ӵ<EFBFBD><D3B5><EFBFBD><EFBFBD>ݿ<EFBFBD> %s: %s"
+
+#: common.c:148
+#, c-format
+msgid "%s: query failed: %s"
+msgstr "%s: <20><>ѯʧ<D1AF><CAA7>: %s"
+
+#: common.c:149
+#, c-format
+msgid "%s: query was: %s\n"
+msgstr "%s: <20><>ѯ<EFBFBD><D1AF>: %s\n"
+
+#. translator: Make sure the (y/n) prompts match the translation of this.
+#: common.c:163
+msgid "y"
+msgstr "y"
+
+#. translator: Make sure the (y/n) prompts match the translation of this.
+#: common.c:165
+msgid "n"
+msgstr "n"

src/interfaces/libpq/po/fr.po

@@ -1,6 +1,6 @@
 # French message translation file for libpq
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/fr.po,v 1.4 2003/08/20 21:10:01 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/fr.po,v 1.5 2003/09/15 20:42:40 petere Exp $
 #
 # Use these quotes: <20>%s<>
 # Peter Eisentraut <peter_e@gmx.net>, 2001.
@@ -10,10 +10,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2003-08-15 04:17-0300\n"
+"POT-Creation-Date: 2003-09-15 14:56+0200\n"
 "PO-Revision-Date: 2003-08-15 15:28+0000\n"
 "Last-Translator: Guillaume Lelarge <gleu@wanadoo.fr>\n"
-"Language-Team: FR_fr <fr@li.org>\n"
+"Language-Team: FR_fr <traduction@pgsql-fr.tuxfamily.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: fe-auth.c:232
 #, c-format
 msgid "Kerberos 4 error: %s\n"
-msgstr "erreur de Kerberos 4: %s\n"
+msgstr "erreur Kerberos 4: %s\n"
 
 #: fe-auth.c:394
 #, c-format
@@ -82,7 +82,7 @@ msgstr "sslmode inconnu:
 #: fe-connect.c:472
 #, c-format
 msgid "sslmode \"%s\" invalid when SSL support is not compiled in\n"
-msgstr "sslmode <20>%s<> invalide quand le support de SSL n'a pas <20>t<EFBFBD> compil<69>\n"
+msgstr "sslmode <20>%s<> non valable quand le support SSL n'a pas <20>t<EFBFBD> compil<69>\n"
 
 #: fe-connect.c:783
 #, c-format
@@ -92,7 +92,7 @@ msgstr "n'a pas pu activer le mode non-bloquant pour le socket: %s\n"
 #: fe-connect.c:810
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
-msgstr "n'a pas pu activer le mode non-bloquant de TCP pour le socket: %s\n"
+msgstr "n'a pas pu activer le mode sans d<>lai de TCP pour le socket: %s\n"
 
 #: fe-connect.c:841
 #, c-format
@@ -102,7 +102,7 @@ msgid ""
 "\tconnections on Unix domain socket \"%s\"?\n"
 msgstr ""
 "n'a pas pu connecter au serveur: %s\n"
-"\tEst-ce que le serveur est en <20>xecution <20> l'h<>te local\n"
+"\tEst-ce que le serveur tourne sur l'h<>te local\n"
 "\tet accepte des connexions au socket Unix <20>%s<>?\n"
 
 #: fe-connect.c:853
@@ -113,7 +113,7 @@ msgid ""
 "\tTCP/IP connections on port %s?\n"
 msgstr ""
 "n'a pas pu se connecter au serveur: %s\n"
-"\tEst-ce que le serveur est en ex<65>cution sur l'h<>te <20>%s<>\n"
+"\tEst-ce que le serveur tourne sur l'h<>te <20>%s<>\n"
 "\tet accepte des connexions TCP/IP sur le port %s?\n"
 
 #: fe-connect.c:937
@@ -128,7 +128,7 @@ msgstr "n'a pas pu traduire le service local en adresse: %s\n"
 
 #: fe-connect.c:1144
 msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "<22>tat invalide de connexion, probablement une indication de m<>moire corrompue\n"
+msgstr "<22>tat non valable de connexion, probablement une indication de m<>moire corrompue\n"
 
 #: fe-connect.c:1187
 #, c-format
@@ -138,7 +138,7 @@ msgstr "n'a pas pu cr
 #: fe-connect.c:1298
 #, c-format
 msgid "could not get socket error status: %s\n"
-msgstr "n'a pas pu d<>terminer l'erreur du socket: %s\n"
+msgstr "n'a pas pu d<>terminer le statut d'erreur du socket: %s\n"
 
 #: fe-connect.c:1337
 #, c-format
@@ -172,12 +172,12 @@ msgstr "le serveur ne supporte pas SSL, mais SSL
 #: fe-connect.c:1509
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
-msgstr "r<>ponse invalide au n<>gociation SSL <20>tait re<72>ue: %c\n"
+msgstr "r<>ponse non valable au n<>gociation SSL a <20>t<EFBFBD> re<72>ue: %c\n"
 
 #: fe-connect.c:1566 fe-connect.c:1598
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
-msgstr "requ<71>te d'authentification attendue, mais %c <20>tait re<72>u\n"
+msgstr "requ<71>te d'authentification attendue du serveur, mais %c a <20>t<EFBFBD> re<72>u\n"
 
 #: fe-connect.c:1834
 msgid "unexpected message from server during startup\n"
@@ -186,7 +186,7 @@ msgstr "message inattendu du serveur lors de d
 #: fe-connect.c:1904
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
-msgstr "<22>tat invalide de connexion (%c), probablement une indication de m<>moire corrompue\n"
+msgstr "<22>tat non valable de connexion (%c), probablement une indication de m<>moire corrompue\n"
 
 #: fe-connect.c:2559
 #, c-format
@@ -195,12 +195,12 @@ msgstr "
 
 #: fe-connect.c:2608
 msgid "unterminated quoted string in connection info string\n"
-msgstr "cha<EFBFBD>ne incompl<70>te entre guillemets dans la cha<68>ne de param<61>tres de connexion\n"
+msgstr "guillemets non referm<72>s dans la cha<68>ne de param<61>tres de connexion\n"
 
 #: fe-connect.c:2642
 #, c-format
 msgid "invalid connection option \"%s\"\n"
-msgstr "option invalide de connexion <20>%s<>\n"
+msgstr "option de connexion non valable <EFBFBD>%s<>\n"
 
 #: fe-connect.c:2854
 msgid "connection pointer is NULL\n"
@@ -211,7 +211,7 @@ msgstr "le pointeur de connexion vaut NULL\n"
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
 "be u=rw (0600)\n"
-msgstr "ATTENTION: Le fichier des mots de passe %s a des permission de groupe et pour tous en lecture; les permissions doivent <20>tre u=rw (0600)\n"
+msgstr "ATTENTION: Le fichier des mots de passe %s a des droits de groupe et pour tous en lecture; les droits devraient <20>tre u=rw (0600)\n"
 
 #: fe-exec.c:484
 msgid "NOTICE"
@@ -284,17 +284,17 @@ msgstr "n'a pas pu interpr
 #: fe-lobj.c:402 fe-lobj.c:487
 #, c-format
 msgid "could not open file \"%s\": %s\n"
-msgstr "n'a pas pu ouvrir <20>%s<>: %s\n"
+msgstr "n'a pas pu ouvrir le fichier <EFBFBD>%s<>: %s\n"
 
 #: fe-lobj.c:414
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
-msgstr "ne peut pas cr<63>er l'objet large pour le fichier \"%s\"\n"
+msgstr "ne peut pas cr<63>er le gros objet pour le fichier \"%s\"\n"
 
 #: fe-lobj.c:424 fe-lobj.c:474
 #, c-format
 msgid "could not open large object %u\n"
-msgstr "ne peut pas ouvrir l'objet large %u\n"
+msgstr "ne peut pas ouvrir le gros objet %u\n"
 
 #: fe-lobj.c:439
 #, c-format
@@ -308,7 +308,7 @@ msgstr "erreur d'
 
 #: fe-lobj.c:568
 msgid "query to initialize large object functions did not return data\n"
-msgstr "la requ<71>te d'initialisation des fonctions des objets larges ne retourne pas de donn<6E>es\n"
+msgstr "la requ<71>te d'initialisation des fonctions de gros objets ne renvoie pas de donn<6E>es\n"
 
 #: fe-lobj.c:606
 msgid "cannot determine OID of function lo_open\n"
@@ -367,14 +367,14 @@ msgid ""
 "\tThis probably means the server terminated abnormally\n"
 "\tbefore or while processing the request.\n"
 msgstr ""
-"la connexion <20>tait termin<69>e <20> l'improviste par le serveur\n"
+"la connexion a <20>t<EFBFBD> termin<69>e <20> l'improviste par le serveur\n"
-"\tPeut-<2D>tre c'est <20> dire que le serveur a termin<69> anormalement\n"
+"\tCela signifie probablement que le serveur a termin<69> anormalement\n"
 "\tavant ou lors du traitement de la requ<71>te.\n"
 
 #: fe-misc.c:803
 #, c-format
 msgid "could not send data to server: %s\n"
-msgstr "n'a pas pu transmettre des donn<6E>es au serveur: %s\n"
+msgstr "n'a pas pu transmettre les donn<6E>es au serveur: %s\n"
 
 #: fe-misc.c:905
 msgid "timeout expired\n"
@@ -394,23 +394,23 @@ msgstr "
 msgid "could not establish SSL connection: %s\n"
 msgstr "n'a pas pu <20>tablir la connexion SSL: %s\n"
 
-#: fe-secure.c:308 fe-secure.c:380 fe-secure.c:894
+#: fe-secure.c:308 fe-secure.c:380 fe-secure.c:907
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "erreur SYSCALL SSL: %s\n"
 
-#: fe-secure.c:313 fe-secure.c:385 fe-secure.c:898
+#: fe-secure.c:313 fe-secure.c:385 fe-secure.c:911
 msgid "SSL SYSCALL error: EOF detected\n"
-msgstr "erreur SYSCALL SSL: EOF a <20>t<EFBFBD> trouv<EFBFBD>\n"
+msgstr "erreur SYSCALL SSL: EOF d<EFBFBD>tect<EFBFBD>\n"
 
-#: fe-secure.c:322 fe-secure.c:393 fe-secure.c:904
+#: fe-secure.c:322 fe-secure.c:393 fe-secure.c:917
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "erreur de SSL: %s\n"
 
-#: fe-secure.c:330 fe-secure.c:401 fe-secure.c:910
+#: fe-secure.c:330 fe-secure.c:401 fe-secure.c:923
 msgid "Unknown SSL error code\n"
-msgstr "code d'erreur SSL inconnue\n"
+msgstr "code d'erreur SSL inconnu\n"
 
 #: fe-secure.c:459
 #, c-format
@@ -436,66 +436,66 @@ msgstr "le nom courant du serveur \"%s\" n'a pas pu
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "le nom courant du serveur \"%s\" n'a pas pu <20>tre r<>solu en une adresse d'un pair\n"
 
-#: fe-secure.c:704
+#: fe-secure.c:712
 msgid "could not get user information\n"
 msgstr "n'a pas pu obtenir les informations utilisateur\n"
 
-#: fe-secure.c:716
+#: fe-secure.c:724
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "n'a pas pu ouvrir le certificat (%s): %s\n"
 
-#: fe-secure.c:723
+#: fe-secure.c:731
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "n'a pas pu lire le certificat (%s): %s\n"
 
-#: fe-secure.c:736
+#: fe-secure.c:744
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "le certificat est pr<70>sent, mais pas la cl<63> priv<69>e (%s)\n"
 
-#: fe-secure.c:745
+#: fe-secure.c:753
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
-msgstr "la cl<63> priv<69>e (%s) n'a pas les bonnes permissions\n"
+msgstr "la cl<63> priv<69>e (%s) n'a pas les bons droits\n"
 
-#: fe-secure.c:752
+#: fe-secure.c:760
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "n'a pas pu ouvrir le fichier de cl<63> priv<69>e (%s): %s\n"
 
-#: fe-secure.c:761
+#: fe-secure.c:769
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "la cl<63> priv<69>e (%s) a chang<6E> pendant l'ex<65>cution\n"
 
-#: fe-secure.c:768
+#: fe-secure.c:776
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "n'a pas pu lire la cl<63> priv<69>e (%s): %s\n"
 
-#: fe-secure.c:780
+#: fe-secure.c:788
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "le certificat et la cl<63> priv<69>e ne correspondent pas (%s): %s\n"
 
-#: fe-secure.c:810
+#: fe-secure.c:821
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "n'a pas pu cr<63>er le contexte SSL: %s\n"
 
-#: fe-secure.c:828 fe-secure.c:836
+#: fe-secure.c:840 fe-secure.c:848
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "n'a pas pu lire la liste de certificat racine (%s): %s\n"
 
-#: fe-secure.c:929
+#: fe-secure.c:942
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "le certificat n'a pas pu <20>tre valid<69>: %s\n"
 
-#: fe-secure.c:941
+#: fe-secure.c:954
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "le certificat n'a pas pu <20>tre obtenu: %s\n"
@@ -504,22 +504,22 @@ msgstr "le certificat n'a pas pu
 #~ msgstr "le serveur ne supporte pas SSL, et l'essai pr<70>c<EFBFBD>dent sans SSL a <20>chou<6F>\n"
 
 #~ msgid "could not determine the PostgreSQL user name to use\n"
-#~ msgstr "n'a pas pu d<>terminer le nom d'utilisateur <20> utiliser\n"
+#~ msgstr "n'a pas pu d<>terminer le nom d'utilisateur PostgreSQL <EFBFBD> utiliser\n"
 
 #~ msgid "invalid host address: %s\n"
-#~ msgstr "adresse invalide de l'h<>te: %s\n"
+#~ msgstr "adresse non valable de l'h<>te: %s\n"
 
 #~ msgid "unknown host name: %s\n"
 #~ msgstr "nom inconnu de l'h<>te: %s\n"
 
 #~ msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-#~ msgstr "<22>tat invalide de setenv (%c), probablement une indication de m<>moire corrompue\n"
+#~ msgstr "<22>tat non valable de setenv (%c), probablement une indication de m<>moire corrompue\n"
 
 #~ msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
-#~ msgstr "nom invalide d'encodage en PGCLIENTENCODING: %s\n"
+#~ msgstr "nom d'encodage non valable dans PGCLIENTENCODING: %s\n"
 
 #~ msgid "invalid state %c, probably indicative of memory corruption\n"
-#~ msgstr "<22>tat invalide (%c), probablement une indication de m<>moire corrompue\n"
+#~ msgstr "<22>tat non valable (%c), probablement une indication de m<>moire corrompue\n"
 
 #~ msgid "message type 0x%02x arrived from server while idle\n"
 #~ msgstr "type de message 0x%02x est arriv<69> du serveur pendant qu'il <20>tait inactif\n"
@@ -531,23 +531,22 @@ msgstr "le certificat n'a pas pu
 #~ msgid ""
 #~ "server sent data (\"D\" message) without prior row description (\"T\" "
 #~ "message)\n"
-#~ msgstr "le serveur a envoy<6F> des donn<6E>es (message \"D\") sans description de ligne pr<EFBFBD>alable (message \"T\")\n"
+#~ msgstr "le serveur a envoy<6F> des donn<6E>es (message \"D\") sans description pr<70>alable de ligne (message \"T\")\n"
 
 #~ msgid ""
 #~ "server sent binary data (\"B\" message) without prior row description (\"T"
 #~ "\" message)\n"
-#~ msgstr "le serveur a envoy<6F> des donn<6E>es binaires (message \"B\") sans description ant<EFBFBD>rieure de la ligne (message \"T\" )\n"
+#~ msgstr "le serveur a envoy<6F> des donn<6E>es binaires (message \"B\") sans description pr<EFBFBD>alable de la ligne (message \"T\" )\n"
 
 #~ msgid ""
 #~ "unexpected response from server; first received character was \"%c\"\n"
-#~ msgstr "r<>ponse inattendue du serveur; le premier caract<63>re re<72>u a <20>t<EFBFBD> <20>%c<>\n"
+#~ msgstr "r<>ponse inattendue du serveur; le premier caract<63>re re<72>u <20>tait <20>%c<>\n"
 
 #~ msgid "lost synchronization with server, resetting connection\n"
-#~ msgstr "synchronisation avec le serveur <EFBFBD>tait perdue, la connexion sera r<>initialis<69>e\n"
+#~ msgstr "synchronisation avec le serveur perdue, la connexion va <20>tre r<>initialis<69>e\n"
 
 #~ msgid "protocol error: id=0x%x\n"
 #~ msgstr "erreur de protocole: id=0x%x\n"
 
 #~ msgid "no row count available\n"
 #~ msgstr "le nombre de lignes n'est pas disponible\n"
-

src/interfaces/libpq/po/zh_CN.po

@@ -1,14 +1,15 @@
 # simplified Chinese translation file for libpq
 # Bao Wei <weibao@forevertek.com>, 2002
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.2 2002/10/14 19:04:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.3 2003/09/15 20:41:59 petere Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.2\n"
+"Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2002-09-26 15:37+0800\n"
+"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2002-19-14 20:22:06+0800\n"
+"POT-Creation-Date: 2003-08-26 10:45+0000\n"
-"Last-Translator: Bao Wei <weibao@forevertek.com>\n"
+"PO-Revision-Date: 2003-09-15 13:47:06+0800\n"
+"Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
@@ -21,85 +22,90 @@ msgid "Kerberos 4 error: %s\n"
 msgstr "Kerberos 4 <20><><EFBFBD><EFBFBD>: %s\n"
 
 # fe-auth.c:395
-#: fe-auth.c:395
+#: fe-auth.c:394
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD>׽<EFBFBD><D7BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD>ģʽ: %s\n"
 
 # fe-auth.c:412 fe-auth.c:416
-#: fe-auth.c:412 fe-auth.c:416
+#: fe-auth.c:411 fe-auth.c:415
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "kerberos 5 <20><>֤<EFBFBD>ܾ<EFBFBD>: %*s\n"
 
 # fe-auth.c:440
-#: fe-auth.c:440
+#: fe-auth.c:441
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD>׽<EFBFBD><D7BD><EFBFBD>: %s <20>ϻָ<CFBB><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ\n"
 
 # fe-auth.c:503
-#: fe-auth.c:503
+#: fe-auth.c:509
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "<22><>֧<EFBFBD><D6A7> SCM_CRED <20><>֤<EFBFBD><D6A4>ʽ\n"
 
 # fe-auth.c:589
-#: fe-auth.c:589
+#: fe-auth.c:600
 msgid "Kerberos 4 authentication failed\n"
 msgstr "Kerberos 4 <20><>֤ʧ<D6A4><CAA7>\n"
 
 # fe-auth.c:595
-#: fe-auth.c:595
+#: fe-auth.c:606
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "<22><>֧<EFBFBD><D6A7> Kerberos 4 <20><>֤\n"
 
 # fe-auth.c:606
-#: fe-auth.c:606
+#: fe-auth.c:616
 msgid "Kerberos 5 authentication failed\n"
 msgstr "Kerberos 5 <20><>֤ʧ<D6A4><CAA7>\n"
 
 # fe-auth.c:612
-#: fe-auth.c:612
+#: fe-auth.c:622
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "<22><>֧<EFBFBD><D6A7> Kerberos 5 <20><>֤\n"
 
 # fe-auth.c:640
-#: fe-auth.c:640
+#: fe-auth.c:650
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "<22><>֧<EFBFBD><D6A7> %u <20><>֤<EFBFBD><D6A4>ʽ\n"
 
 # fe-auth.c:677
-#: fe-auth.c:677
+#: fe-auth.c:687
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
 msgstr "<22><><EFBFBD>ԷǷ<D4B7><C7B7><EFBFBD>֤<EFBFBD><D6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\"\n"
 
 # fe-auth.c:734
-#: fe-auth.c:734
+#: fe-auth.c:758
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: <20><>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>֤ϵͳ: %d\n"
 
-# fe-connect.c:484
+#: fe-connect.c:452
-#: fe-connect.c:484
+#, c-format
-msgid "could not determine the PostgreSQL user name to use\n"
+msgid "unrecognized sslmode: \"%s\"\n"
-msgstr "<22>޷<EFBFBD><EFBFBD>ж<EFBFBD>Ҫʹ<EFBFBD>õ<EFBFBD> PostgreSQL <20>û<EFBFBD><C3BB><EFBFBD>\n"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>Ͽɵ<EFBFBD> sslmode: \"%s\"\n"
+
+#: fe-connect.c:472
+#, c-format
+msgid "sslmode \"%s\" invalid when SSL support is not compiled in\n"
+msgstr "<22><>Ч<EFBFBD><D0A7> sslmode \"%s\", <20><>û<EFBFBD>а<EFBFBD> SSL ֧<>ֱ<EFBFBD><D6B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ\n"
 
 # fe-connect.c:708
-#: fe-connect.c:708
+#: fe-connect.c:783
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD>׽<EFBFBD><D7BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ: %s\n"
 
 # fe-connect.c:732
-#: fe-connect.c:732
+#: fe-connect.c:810
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD>׽<EFBFBD><D7BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ TCP <20><><EFBFBD>ӳ<EFBFBD>ģʽ: %s\n"
 
 # fe-connect.c:752
-#: fe-connect.c:752
+#: fe-connect.c:841
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -111,367 +117,316 @@ msgstr ""
 "\t\"%s\"<22><>׼<EFBFBD><D7BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?\n"
 
 # fe-connect.c:761
-#: fe-connect.c:761
+#: fe-connect.c:853
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
-"\tIs the server running on host %s and accepting\n"
+"\tIs the server running on host \"%s\" and accepting\n"
 "\tTCP/IP connections on port %s?\n"
 msgstr ""
 "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD>ӵ<EFBFBD><D3B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"
-"\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><D0B2><EFBFBD>׼<EFBFBD><D7BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڶ˿<DAB6>\n"
+"\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><D0B2><EFBFBD>׼<EFBFBD><D7BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڶ˿<DAB6>\n"
 "%s <20>ϵ<EFBFBD> TCP/IP <20><><EFBFBD><EFBFBD>?\n"
 
-# fe-connect.c:825
+# fe-misc.c:702
-#: fe-connect.c:825
+#: fe-connect.c:937
 #, c-format
-msgid "invalid host address: %s\n"
+msgid "could not translate hostname \"%s\" to address: %s\n"
-msgstr "<22><EFBFBD>Ч<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ: %s\n"
+msgstr "<22>޷<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\" <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ: %s\n"
 
-# fe-connect.c:844
+# fe-misc.c:702
-#: fe-connect.c:844
+#: fe-connect.c:941
 #, c-format
-msgid "unknown host name: %s\n"
+msgid "could not translate local service to address: %s\n"
-msgstr "δ֪<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"
+msgstr "<22>޷<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͱ<EFBFBD><EFBFBD>ط<EFBFBD><EFBFBD>񵽵<EFBFBD>ַ: %s\n"
+
+# fe-connect.c:1232
+#: fe-connect.c:1144
+msgid "invalid connection state, probably indicative of memory corruption\n"
+msgstr "<22><>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬, <20><><EFBFBD><EFBFBD><EFBFBD>Ǵ洢<C7B4><E6B4A2><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1>ƻ<EFBFBD><C6BB>ı<EFBFBD>־\n"
 
 # fe-connect.c:891
-#: fe-connect.c:891
+#: fe-connect.c:1187
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׽<EFBFBD><D7BD><EFBFBD>: %s\n"
 
-# fe-connect.c:959
-#: fe-connect.c:959
-#, c-format
-msgid "could not send SSL negotiation packet: %s\n"
-msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> SSL <20><><EFBFBD>ְ<EFBFBD>: %s\n"
-
-# fe-connect.c:972
-#: fe-connect.c:972
-#, c-format
-msgid "could not receive server response to SSL negotiation packet: %s\n"
-msgstr "<22>޷<EFBFBD><DEB7>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> SSL <20><><EFBFBD>ְ<EFBFBD><D6B0><EFBFBD><EFBFBD><EFBFBD>Ӧ: %s\n"
-
-# fe-connect.c:1001
-#: fe-connect.c:1001
-#, c-format
-msgid "received invalid response to SSL negotiation: %c\n"
-msgstr "<22>յ<EFBFBD><D5B5><EFBFBD> SSL <20><><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD>Ч<EFBFBD><D0A7>Ӧ: %c\n"
-
-# fe-connect.c:1010
-#: fe-connect.c:1010
-msgid "server does not support SSL, but SSL was required\n"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD><D6A7> SSL, <20><><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA>ʹ<EFBFBD><CAB9> SSL\n"
-
-# fe-connect.c:1232
-#: fe-connect.c:1232
-msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "<22><>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬, <20><><EFBFBD><EFBFBD><EFBFBD>Ǵ洢<C7B4><E6B4A2><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1>ƻ<EFBFBD><C6BB>ı<EFBFBD>־\n"
-
 # fe-connect.c:1263
-#: fe-connect.c:1263
+#: fe-connect.c:1298
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD>׽<EFBFBD><D7BD>ִ<EFBFBD><D6B4><EFBFBD>״̬: %s\n"
 
 # fe-connect.c:1283
-#: fe-connect.c:1283
+#: fe-connect.c:1337
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD>׽<EFBFBD><D7BD>ֻ<EFBFBD>ȡ<EFBFBD>ͻ<EFBFBD><CDBB>˵<EFBFBD>ַ: %s\n"
 
+# fe-connect.c:959
+#: fe-connect.c:1382
+#, c-format
+msgid "could not send SSL negotiation packet: %s\n"
+msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> SSL <20><><EFBFBD>ְ<EFBFBD>: %s\n"
+
+# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+# fe-lobj.c:536
+#: fe-connect.c:1404 fe-connect.c:2511 fe-connect.c:2520 fe-connect.c:3087
+#: fe-lobj.c:540
+msgid "out of memory\n"
+msgstr "<22>ڴ<EFBFBD><DAB4>þ<EFBFBD>\n"
+
 # fe-connect.c:1322
-#: fe-connect.c:1322
+#: fe-connect.c:1417
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"
 
+# fe-connect.c:972
+#: fe-connect.c:1457
+#, c-format
+msgid "could not receive server response to SSL negotiation packet: %s\n"
+msgstr "<22>޷<EFBFBD><DEB7>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> SSL <20><><EFBFBD>ְ<EFBFBD><D6B0><EFBFBD><EFBFBD><EFBFBD>Ӧ: %s\n"
+
+# fe-connect.c:1010
+#: fe-connect.c:1476 fe-connect.c:1493
+msgid "server does not support SSL, but SSL was required\n"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD><D6A7> SSL, <20><><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA>ʹ<EFBFBD><CAB9> SSL\n"
+
+# fe-connect.c:1001
+#: fe-connect.c:1509
+#, c-format
+msgid "received invalid response to SSL negotiation: %c\n"
+msgstr "<22>յ<EFBFBD><D5B5><EFBFBD> SSL <20><><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD>Ч<EFBFBD><D0A7>Ӧ: %c\n"
+
 # fe-connect.c:1378
-#: fe-connect.c:1378
+#: fe-connect.c:1566 fe-connect.c:1598
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "<22>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><D6A4><EFBFBD><EFBFBD>, ȴ<>յ<EFBFBD> %c\n"
 
 # fe-connect.c:1490
-#: fe-connect.c:1490
+#: fe-connect.c:1834
 msgid "unexpected message from server during startup\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ķ<EFBFBD>Ԥ<EFBFBD><D4A4><EFBFBD><EFBFBD>Ϣ\n"
 
 # fe-connect.c:1549
-#: fe-connect.c:1549
+#: fe-connect.c:1904
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "<22><>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ %c, <20><><EFBFBD><EFBFBD><EFBFBD>Ǵ洢<C7B4><E6B4A2><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1>ƻ<EFBFBD><C6BB>ı<EFBFBD>־\n"
 
-# fe-connect.c:1637
-#: fe-connect.c:1637
-#, c-format
-msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-msgstr "<22><>Ч<EFBFBD><D0A7> setenv ״̬  %c, <20><><EFBFBD><EFBFBD><EFBFBD>Ǵ洢<C7B4><E6B4A2><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1>ƻ<EFBFBD><C6BB>ı<EFBFBD>־\n"
-
-# fe-connect.c:1676
-#: fe-connect.c:1676
-#, c-format
-msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
-msgstr "<22><> PGCLIENTENCODING <20>еķǷ<C4B7><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"
-
-# fe-connect.c:1800
-#: fe-connect.c:1800
-#, c-format
-msgid "invalid state %c, probably indicative of memory corruption\n"
-msgstr "<22><>Ч״̬ %c, <20><><EFBFBD><EFBFBD><EFBFBD>Ǵ洢<C7B4><E6B4A2><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1>ƻ<EFBFBD><C6BB>ı<EFBFBD>־\n"
-
-# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
-# fe-lobj.c:536
-#: fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
-#: fe-lobj.c:536
-msgid "out of memory\n"
-msgstr "<22>ڴ<EFBFBD><DAB4>þ<EFBFBD>\n"
-
 # fe-connect.c:2475
-#: fe-connect.c:2475
+#: fe-connect.c:2559
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD>ȱ<EFBFBD><C8B1> \"=\"\n"
 
 # fe-connect.c:2524
-#: fe-connect.c:2524
+#: fe-connect.c:2608
 msgid "unterminated quoted string in connection info string\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD>ִ<EFBFBD><D6B4><EFBFBD>δ<EFBFBD><CEB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>\n"
 
 # fe-connect.c:2558
-#: fe-connect.c:2558
+#: fe-connect.c:2642
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "<22>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD><D1A1> \"%s\"\n"
 
 # fe-connect.c:2744
-#: fe-connect.c:2744
+#: fe-connect.c:2854
 msgid "connection pointer is NULL\n"
 msgstr "<22><><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD> NULL\n"
 
 # fe-connect.c:2953
-#: fe-connect.c:2953
+#: fe-connect.c:3105
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
 "be u=rw (0600)\n"
 msgstr "<22><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> %s Ȩ<><C8A8><EFBFBD><EFBFBD><EFBFBD>ò<EFBFBD><C3B2><EFBFBD>; Ȩ<><C8A8>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD> Ϊ u=rw (0600)\n"
 
+#: fe-exec.c:484
+msgid "NOTICE"
+msgstr "ע<><D7A2>"
+
 # fe-exec.c:737
-#: fe-exec.c:737
+#: fe-exec.c:637 fe-exec.c:689
 msgid "command string is a null pointer\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8>\n"
 
+# fe-exec.c:737
+#: fe-exec.c:724
+msgid "statement name is a null pointer\n"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8>\n"
+
 # fe-exec.c:745
-#: fe-exec.c:745
+#: fe-exec.c:755
 msgid "no connection to the server\n"
 msgstr "û<>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 # fe-exec.c:752
-#: fe-exec.c:752
+#: fe-exec.c:762
 msgid "another command is already in progress\n"
 msgstr "<22>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD>\n"
 
-# fe-exec.c:950
+#: fe-exec.c:798 fe-exec.c:1432
-#: fe-exec.c:950
+msgid "function requires at least 3.0 protocol\n"
-#, c-format
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ 3.0 <20>汾<EFBFBD><E6B1BE>Э<EFBFBD><D0AD>\n"
-msgid "message type 0x%02x arrived from server while idle\n"
-msgstr "<22><><EFBFBD><EFBFBD>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ 0x%02x <20><><EFBFBD><EFBFBD>Ϣ\n"
-
-# fe-exec.c:992
-#: fe-exec.c:992
-#, c-format
-msgid ""
-"unexpected character %c following empty query response (\"I\" message)\n"
-msgstr "<22>ڿյIJ<D5B5>ѯ<EFBFBD><D1AF>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ŷ<EFBFBD>Ԥ<EFBFBD>ڵ<EFBFBD><DAB5>ַ<EFBFBD> %c (\"I\" <20><>Ϣ)\n"
-
-# fe-exec.c:1049
-#: fe-exec.c:1049
-msgid ""
-"server sent data (\"D\" message) without prior row description (\"T\" "
-"message)\n"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>з<EFBFBD><D0B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD>·<EFBFBD><C2B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (\"D\" <20><>Ϣ) (\"T\" <20><>Ϣ)\n"
-
-# fe-exec.c:1066
-#: fe-exec.c:1066
-msgid ""
-"server sent binary data (\"B\" message) without prior row description (\"T\" "
-"message)\n"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>з<EFBFBD><D0B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD>·<EFBFBD><C2B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (\"B\" <20><>Ϣ) (\"T\" <20><>Ϣ)\n"
-
-# fe-exec.c:1082
-#: fe-exec.c:1082
-#, c-format
-msgid "unexpected response from server; first received character was \"%c\"\n"
-msgstr "<22><><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ; <20>յ<EFBFBD><D5B5>ĵ<EFBFBD>һ<EFBFBD><D2BB><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD> \"%c\"\n"
 
 # fe-exec.c:1371
-#: fe-exec.c:1371
+#: fe-exec.c:1100
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> asyncStatus(<28>첽״̬): %d\n"
 
+#: fe-exec.c:1205
+msgid "COPY terminated by new PQexec"
+msgstr "COPY <20><>һ<EFBFBD><D2BB><EFBFBD>µ<EFBFBD> PQexec <20><>ֹ"
+
 # fe-exec.c:1421
-#: fe-exec.c:1421
+#: fe-exec.c:1213
-msgid "COPY state must be terminated first\n"
+msgid "COPY IN state must be terminated first\n"
-msgstr "COPY ״̬<D7B4><CCAC><EFBFBD><EFBFBD><EFBFBD>Ƚ<EFBFBD><C8BD><EFBFBD>\n"
+msgstr "COPY IN ״̬<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƚ<EFBFBD><EFBFBD><EFBFBD>\n"
+
+# fe-exec.c:1421
+#: fe-exec.c:1233
+msgid "COPY OUT state must be terminated first\n"
+msgstr "COPY OUT ״̬<D7B4><CCAC><EFBFBD><EFBFBD><EFBFBD>Ƚ<EFBFBD><C8BD><EFBFBD>\n"
 
 # fe-exec.c:1780
-#: fe-exec.c:1780
+#: fe-exec.c:1336 fe-exec.c:1390 fe-exec.c:1474
 msgid "no COPY in progress\n"
 msgstr "û<><C3BB><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD> COPY\n"
 
-# fe-exec.c:1819
-#: fe-exec.c:1819
-msgid "lost synchronization with server, resetting connection\n"
-msgstr "ʧȥ<CAA7><C8A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬ<EFBFBD><CDAC>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
-
 # fe-exec.c:1884
-#: fe-exec.c:1884
+#: fe-exec.c:1666
 msgid "connection in wrong state\n"
 msgstr "<22><><EFBFBD>Ӵ<EFBFBD><D3B4>ڴ<EFBFBD><DAB4><EFBFBD>״̬\n"
 
-# fe-exec.c:1986 fe-exec.c:2020
-#: fe-exec.c:1986 fe-exec.c:2020
-#, c-format
-msgid "protocol error: id=0x%x\n"
-msgstr "Э<><D0AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: id=0x%x\n"
-
 # fe-exec.c:2055
-#: fe-exec.c:2055
+#: fe-exec.c:1697
 msgid "invalid ExecStatusType code"
 msgstr "<22>Ƿ<EFBFBD> ExecStatusType <20><><EFBFBD><EFBFBD>"
 
 # fe-exec.c:2108 fe-exec.c:2141
-#: fe-exec.c:2108 fe-exec.c:2141
+#: fe-exec.c:1761 fe-exec.c:1784
 #, c-format
-msgid "column number %d is out of range 0..%d\n"
+msgid "column number %d is out of range 0..%d"
-msgstr "<22>к<EFBFBD><D0BA><EFBFBD> %d <20><><EFBFBD><EFBFBD><EFBFBD>˷<EFBFBD>Χ 0..%d\n"
+msgstr "<22>к<EFBFBD><D0BA><EFBFBD> %d <20><><EFBFBD><EFBFBD><EFBFBD>˷<EFBFBD>Χ 0..%d"
 
 # fe-exec.c:2130
-#: fe-exec.c:2130
+#: fe-exec.c:1777
 #, c-format
-msgid "row number %d is out of range 0..%d\n"
+msgid "row number %d is out of range 0..%d"
-msgstr "<22>к<EFBFBD><D0BA><EFBFBD> %d <20><><EFBFBD><EFBFBD><EFBFBD>˷<EFBFBD>Χ 0..%d\n"
+msgstr "<22>к<EFBFBD><D0BA><EFBFBD> %d <20><><EFBFBD><EFBFBD><EFBFBD>˷<EFBFBD>Χ 0..%d"
 
 # fe-exec.c:2325
-#: fe-exec.c:2325
+#: fe-exec.c:2014
 #, c-format
-msgid "could not interpret result from server: %s\n"
+msgid "could not interpret result from server: %s"
-msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ľ<EFBFBD><C4BD><EFBFBD>: %s\n"
+msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ľ<EFBFBD><C4BD><EFBFBD>: %s"
-
-# fe-exec.c:2341
-#: fe-exec.c:2341
-msgid "no row count available\n"
-msgstr "û<>пɻ<D0BF><C9BB>õ<EFBFBD><C3B5><EFBFBD><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-lobj.c:400 fe-lobj.c:483
+#: fe-lobj.c:402 fe-lobj.c:487
 #, c-format
 msgid "could not open file \"%s\": %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
 
 # fe-lobj.c:412
-#: fe-lobj.c:412
+#: fe-lobj.c:414
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
 msgstr "<22>޷<EFBFBD>Ϊ<EFBFBD>ļ<EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:422 fe-lobj.c:472
-#: fe-lobj.c:422 fe-lobj.c:472
+#: fe-lobj.c:424 fe-lobj.c:474
 #, c-format
 msgid "could not open large object %u\n"
 msgstr "<22>޷<EFBFBD><DEB7>򿪴<EFBFBD><F2BFAAB4><EFBFBD><EFBFBD><EFBFBD> %u\n"
 
 # fe-lobj.c:437
-#: fe-lobj.c:437
+#: fe-lobj.c:439
 #, c-format
 msgid "error while reading file \"%s\"\n"
 msgstr "<22><>ȡ<EFBFBD>ļ<EFBFBD> \"%s\" ʱ<><CAB1><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:498
-#: fe-lobj.c:498
+#: fe-lobj.c:502
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "д<><D0B4><EFBFBD>ļ<EFBFBD> \"%s\" ʱ<><CAB1><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:564
-#: fe-lobj.c:564
+#: fe-lobj.c:568
 msgid "query to initialize large object functions did not return data\n"
 msgstr "<22><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IJ<EFBFBD>ѯû<D1AF>з<EFBFBD><D0B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:602
-#: fe-lobj.c:602
+#: fe-lobj.c:606
 msgid "cannot determine OID of function lo_open\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_open <20><> OID\n"
 
 # fe-lobj.c:609
-#: fe-lobj.c:609
+#: fe-lobj.c:613
 msgid "cannot determine OID of function lo_close\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_close <20><> OID\n"
 
 # fe-lobj.c:616
-#: fe-lobj.c:616
+#: fe-lobj.c:620
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_creat <20><> OID\n"
 
 # fe-lobj.c:623
-#: fe-lobj.c:623
+#: fe-lobj.c:627
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_unlink <20><> OID\n"
 
 # fe-lobj.c:630
-#: fe-lobj.c:630
+#: fe-lobj.c:634
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_lseek <20><> OID\n"
 
 # fe-lobj.c:637
-#: fe-lobj.c:637
+#: fe-lobj.c:641
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_tell <20><> OID\n"
 
 # fe-lobj.c:644
-#: fe-lobj.c:644
+#: fe-lobj.c:648
 msgid "cannot determine OID of function loread\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> loread <20><> OID\n"
 
 # fe-lobj.c:651
-#: fe-lobj.c:651
+#: fe-lobj.c:655
 msgid "cannot determine OID of function lowrite\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lowrite <20><> OID\n"
 
 # fe-misc.c:303
-#: fe-misc.c:303
+#: fe-misc.c:228
 #, c-format
-msgid "integer of size %lu not supported by pqGetInt\n"
+msgid "integer of size %lu not supported by pqGetInt"
-msgstr "pgGetInt <20><>֧<EFBFBD>ִ<EFBFBD>СΪ %lu <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+msgstr "pgGetInt <20><>֧<EFBFBD>ִ<EFBFBD>СΪ %lu <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 # fe-misc.c:341
-#: fe-misc.c:341
+#: fe-misc.c:264
 #, c-format
-msgid "integer of size %lu not supported by pqPutInt\n"
+msgid "integer of size %lu not supported by pqPutInt"
-msgstr "pgPutInt <20><>֧<EFBFBD>ִ<EFBFBD>СΪ %lu <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+msgstr "pgPutInt <20><>֧<EFBFBD>ִ<EFBFBD>СΪ %lu <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
-#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
-#, c-format
-msgid "select() failed: %s\n"
-msgstr "select() ʧ<><CAA7>: %s\n"
 
 # fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
-#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
+#: fe-misc.c:544 fe-misc.c:748
 msgid "connection not open\n"
 msgstr "<22><><EFBFBD><EFBFBD>δ<EFBFBD><CEB4><EFBFBD><EFBFBD>\n"
 
 # fe-misc.c:515 fe-misc.c:595
-#: fe-misc.c:515 fe-misc.c:595
+#: fe-misc.c:610 fe-misc.c:701
 #, c-format
 msgid "could not receive data from server: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"
 
 # fe-misc.c:612 fe-misc.c:686
-#: fe-misc.c:612 fe-misc.c:686
+#: fe-misc.c:718 fe-misc.c:786
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -482,122 +437,150 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹ\n"
 
 # fe-misc.c:702
-#: fe-misc.c:702
+#: fe-misc.c:803
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"
 
-#: fe-secure.c:275 fe-secure.c:321
+#: fe-misc.c:905
+msgid "timeout expired\n"
+msgstr "<22><>ʱ<EFBFBD><CAB1>\n"
+
+# fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
+#: fe-misc.c:950
+msgid "socket not open\n"
+msgstr "<22>׽<EFBFBD><D7BD><EFBFBD>δ<EFBFBD><CEB4><EFBFBD><EFBFBD>\n"
+
+# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
+#: fe-misc.c:973
+#, c-format
+msgid "select() failed: %s\n"
+msgstr "select() ʧ<><CAA7>: %s\n"
+
+#: fe-secure.c:246
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> SSL <20><><EFBFBD><EFBFBD>: %s\n"
+
+#: fe-secure.c:308 fe-secure.c:380 fe-secure.c:894
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL <20><><EFBFBD><EFBFBD>: %s\n"
 
+#: fe-secure.c:313 fe-secure.c:385 fe-secure.c:898
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "SSL SYSCALL <20><><EFBFBD><EFBFBD>: <20><><EFBFBD>ֽ<EFBFBD><D6BD><EFBFBD><EFBFBD><EFBFBD>\n"
+
 # fe-auth.c:232
-#: fe-secure.c:280 fe-secure.c:326
+#: fe-secure.c:322 fe-secure.c:393 fe-secure.c:904
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL <20><><EFBFBD><EFBFBD>: %s\n"
 
+#: fe-secure.c:330 fe-secure.c:401 fe-secure.c:910
+msgid "Unknown SSL error code\n"
+msgstr "δ֪<CEB4><D6AA> SSL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+
 # fe-lobj.c:498
-#: fe-secure.c:387
+#: fe-secure.c:459
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "<22><>ѯ<EFBFBD>׽<EFBFBD><D7BD>ִ<EFBFBD><D6B4><EFBFBD>: %s\n"
 
 # fe-connect.c:1263
-#: fe-secure.c:400
+#: fe-secure.c:481
 #, c-format
 msgid "could not get information about host (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%s) <20><><EFBFBD><EFBFBD>Ϣ: %s\n"
 
-#: fe-secure.c:419
+#: fe-secure.c:500
 msgid "unsupported protocol\n"
 msgstr "<22><>֧<EFBFBD>ֵ<EFBFBD>Э<EFBFBD><D0AD>\n"
 
-#: fe-secure.c:441
+#: fe-secure.c:522
 #, c-format
 msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\" <20><><EFBFBD>ܽ<EFBFBD><DCBD><EFBFBD><EFBFBD><EFBFBD> %ld.%ld.%ld.%ld\n"
 
-#: fe-secure.c:448
+#: fe-secure.c:529
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\" <20><><EFBFBD>ܽ<EFBFBD><DCBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Զ˵<D4B6>ַ\n"
 
 # fe-connect.c:1263
-#: fe-secure.c:617
+#: fe-secure.c:704
 msgid "could not get user information\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD>û<EFBFBD><C3BB><EFBFBD>Ϣ\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:629
+#: fe-secure.c:716
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><D6A4> (%s): %s\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:636
+#: fe-secure.c:723
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ֤<C8A1><D6A4> (%s): %s\n"
 
-#: fe-secure.c:649
+#: fe-secure.c:736
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "<22><>֤<EFBFBD><D6A4>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˽Կ (%s)\n"
 
-#: fe-secure.c:658
+#: fe-secure.c:745
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "˽Կ (%s) <20>д<EFBFBD><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:665
+#: fe-secure.c:752
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>˽Կ<CBBD>ļ<EFBFBD> (%s): %s\n"
 
-#: fe-secure.c:674
+#: fe-secure.c:761
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "<22><>ִ<EFBFBD>й<EFBFBD><D0B9><EFBFBD><EFBFBD><EFBFBD>˽Կ (%s) <20>ı<EFBFBD><C4B1><EFBFBD>\n"
 
 # fe-connect.c:891
-#: fe-secure.c:681
+#: fe-secure.c:768
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ˽Կ (%s): %s\n"
 
-#: fe-secure.c:693
+#: fe-secure.c:780
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "֤<><D6A4>/˽Կ<CBBD><D4BF>ƥ<EFBFBD><C6A5> (%s): %s\n"
 
-#: fe-secure.c:721
+#: fe-secure.c:810
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> SSL <20><><EFBFBD><EFBFBD>: %s\n"
 
 # fe-connect.c:891
-#: fe-secure.c:737 fe-secure.c:745
+#: fe-secure.c:828 fe-secure.c:836
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD><C8A1>֤<EFBFBD><D6A4><EFBFBD>б<EFBFBD> (%s): %s\n"
 
-#: fe-secure.c:794
+#: fe-secure.c:929
-#, c-format
-msgid "could not establish SSL connection: %s\n"
-msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> SSL <20><><EFBFBD><EFBFBD>: %s\n"
-
-#: fe-secure.c:812
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>֤֤<D6A4><D6A4>: %s\n"
 
-#: fe-secure.c:824
+#: fe-secure.c:941
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><D6A4>: %s\n"
 
-#~ msgid "could not flush enough data (space available: %d, space needed %d)\n"
+# fe-connect.c:1010
-#~ msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ˢ<EFBFBD>㹻<EFBFBD><E3B9BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>ÿռ<C3BF>: %d, <20><>Ҫ<EFBFBD>ռ<EFBFBD> %d)\n"
+#~ msgid "server does not support SSL, and previous non-SSL attempt failed\n"
+#~ msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD><D6A7> SSL, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><C7B0> SSL <20><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>\n"
+
+# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
+#~ msgid "getaddrinfo() failed: %s\n"
+#~ msgstr "getaddrinfo() ʧ<><CAA7>: %s\n"