Re: Chinese NLS patch, the third try.

I applied pgsql and pg_dump. libpq does not apply cleanly. Please
resubmit.

---------------------------------------------------------------------------

> Bruce Momjian wrote:
>
> > > >
> > > > OK, I think the anoncvs server was fixed yesterday. Also, the patch you
> > > > mentioned is the one I used and it didn't apply cleanly. If you can get
> > > > into CVS, please send a new copy. If you can't get into CVS, perhaps
> > > > the snapshots would work for you.
> > >
> > > I'v download a snapshot and generated new patchs, it's at:
> > >
> > > http://laser.zhengmai.com.cn/download/backend_zh_CN.po.diff.gz
> >
> > Applied.
> >
> > >
> > > the anonymous CVS still can't work, and it seems that those
> > > .po files for psql & pg_dump I've submit is OK with what's in
> > > snapshot, so I didn't send them.
> >
> > pg_dump doesn't apply cleanly here. Please send over the other two
> > diffs.
> >
>
> Ok, here are those patches, and still the libpq's patch I've forgot
> last time.
>
> regards laser

> *** zh_CN.po.old Mon Nov 26 20:37:21 2001
> --- zh_CN.po Mon Nov 26 20:38:11 2001
> ***************
> *** 6,13 ****
> msgid ""
> msgstr ""
> "Project-Id-Version: PostgreSQL 7.2\n"
> ! "POT-Creation-Date: 2001-10-07 12:07+0800\n"
> ! "PO-Revision-Date: 2001-10-08 23:49:06+0800\n"
> "Last-Translator: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"
> "Language-Team: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"
> "MIME-Version: 1.0\n"
> --- 6,13 ----
> msgid ""
> msgstr ""
> "Project-Id-Version: PostgreSQL 7.2\n"
> ! "POT-Creation-Date: 2001-11-26 20:37+0800\n"
> ! "PO-Revision-Date: 2001-11-26 20:37:52+0800\n"
> "Last-Translator: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"
> "Language-Team: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"
> "MIME-Version: 1.0\n"
> ***************
> *** 19,35 ****
> msgid "Kerberos 4 error: %s\n"
> msgstr "Kerberos 4 : %s\n"
>
> ! #: fe-auth.c:392
> #, c-format
> msgid "could not set socket to blocking mode: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-auth.c:408
> #, c-format
> msgid "Kerberos 5 authentication rejected: %*s\n"
> msgstr "kerberos 5 : %*s\n"
>
> ! #: fe-auth.c:428
> #, c-format
> msgid "could not restore non-blocking mode on socket: %s\n"
> msgstr ": %s \n"
> --- 19,35 ----
> msgid "Kerberos 4 error: %s\n"
> msgstr "Kerberos 4 : %s\n"
>
> ! #: fe-auth.c:391
> #, c-format
> msgid "could not set socket to blocking mode: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-auth.c:407
> #, c-format
> msgid "Kerberos 5 authentication rejected: %*s\n"
> msgstr "kerberos 5 : %*s\n"
>
> ! #: fe-auth.c:427
> #, c-format
> msgid "could not restore non-blocking mode on socket: %s\n"
> msgstr ": %s \n"
> ***************
> *** 73,89 ****
> msgid "could not determine the PostgreSQL user name to use\n"
> msgstr " PostgreSQL \n"
>
> ! #: fe-connect.c:705
> #, c-format
> msgid "could not set socket to non-blocking mode: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-connect.c:729
> #, c-format
> msgid "could not set socket to TCP no delay mode: %s\n"
> msgstr " TCP : %s\n"
>
> ! #: fe-connect.c:749
> #, c-format
> msgid ""
> "could not connect to server: %s\n"
> --- 73,89 ----
> msgid "could not determine the PostgreSQL user name to use\n"
> msgstr " PostgreSQL \n"
>
> ! #: fe-connect.c:703
> #, c-format
> msgid "could not set socket to non-blocking mode: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-connect.c:727
> #, c-format
> msgid "could not set socket to TCP no delay mode: %s\n"
> msgstr " TCP : %s\n"
>
> ! #: fe-connect.c:747
> #, c-format
> msgid ""
> "could not connect to server: %s\n"
> ***************
> *** 94,100 ****
> "\t Unix \n"
> "\t\"%s\"?\n"
>
> ! #: fe-connect.c:758
> #, c-format
> msgid ""
> "could not connect to server: %s\n"
> --- 94,100 ----
> "\t Unix \n"
> "\t\"%s\"?\n"
>
> ! #: fe-connect.c:756
> #, c-format
> msgid ""
> "could not connect to server: %s\n"
> ***************
> *** 105,151 ****
> "\t %s \n"
> "%s TCP/IP ?\n"
>
> ! #: fe-connect.c:823
> #, c-format
> msgid "invalid host address: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-connect.c:842
> #, c-format
> msgid "unknown host name: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-connect.c:884
> #, c-format
> msgid "could not create socket: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-connect.c:947
> #, c-format
> msgid "could not send SSL negotiation packet: %s\n"
> msgstr " SSL : %s\n"
>
> ! #: fe-connect.c:955
> #, c-format
> msgid "could not receive server response to SSL negotiation packet: %s\n"
> msgstr " SSL : %s\n"
>
> ! #: fe-connect.c:969
> #, c-format
> msgid "could not create SSL context: %s\n"
> msgstr " SSL : %s\n"
>
> ! #: fe-connect.c:979
> #, c-format
> msgid "could not establish SSL connection: %s\n"
> msgstr " SSL : %s\n"
>
> ! #: fe-connect.c:997
> #, c-format
> msgid "received invalid response to SSL negotiation: %c\n"
> msgstr " SSL : %c\n"
>
> ! #: fe-connect.c:1006
> msgid "server does not support SSL, but SSL was required\n"
> msgstr " SSL, SSL\n"
>
> --- 105,151 ----
> "\t %s \n"
> "%s TCP/IP ?\n"
>
> ! #: fe-connect.c:820
> #, c-format
> msgid "invalid host address: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-connect.c:839
> #, c-format
> msgid "unknown host name: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-connect.c:881
> #, c-format
> msgid "could not create socket: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-connect.c:944
> #, c-format
> msgid "could not send SSL negotiation packet: %s\n"
> msgstr " SSL : %s\n"
>
> ! #: fe-connect.c:952
> #, c-format
> msgid "could not receive server response to SSL negotiation packet: %s\n"
> msgstr " SSL : %s\n"
>
> ! #: fe-connect.c:966
> #, c-format
> msgid "could not create SSL context: %s\n"
> msgstr " SSL : %s\n"
>
> ! #: fe-connect.c:976
> #, c-format
> msgid "could not establish SSL connection: %s\n"
> msgstr " SSL : %s\n"
>
> ! #: fe-connect.c:999
> #, c-format
> msgid "received invalid response to SSL negotiation: %c\n"
> msgstr " SSL : %c\n"
>
> ! #: fe-connect.c:1008
> msgid "server does not support SSL, but SSL was required\n"
> msgstr " SSL, SSL\n"
>
> ***************
> *** 173,310 ****
> msgid "expected authentication request from server, but received %c\n"
> msgstr ", %c\n"
>
> ! #: fe-connect.c:1433
> msgid "unexpected message from server during startup\n"
> msgstr "\n"
>
> ! #: fe-connect.c:1492
> #, c-format
> msgid "invalid connection state %c, probably indicative of memory corruption\n"
> msgstr " %c, \n"
>
> ! #: fe-connect.c:1592
> #, c-format
> msgid "invalid setenv state %c, probably indicative of memory corruption\n"
> msgstr " setenv %c, \n"
>
> ! #: fe-connect.c:1633
> #, c-format
> msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
> msgstr " PGCLIENTENCODING : %s\n"
>
> ! #: fe-connect.c:1758
> #, c-format
> msgid "invalid state %c, probably indicative of memory corruption\n"
> msgstr " %c, \n"
>
> ! #: fe-connect.c:2379 fe-connect.c:2388 fe-exec.c:1193 fe-lobj.c:536
> msgid "out of memory\n"
> msgstr "\n"
>
> ! #: fe-connect.c:2427
> #, c-format
> msgid "missing \"=\" after \"%s\" in connection info string\n"
> msgstr " \"%s\" \"=\"\n"
>
> ! #: fe-connect.c:2476
> msgid "unterminated quoted string in connection info string\n"
> msgstr "\n"
>
> ! #: fe-connect.c:2510
> #, c-format
> msgid "invalid connection option \"%s\"\n"
> msgstr " \"%s\"\n"
>
> ! #: fe-connect.c:2695
> msgid "connection pointer is NULL\n"
> msgstr " NULL\n"
>
> ! #: fe-exec.c:635
> msgid "command string is a null pointer\n"
> msgstr "\n"
>
> ! #: fe-exec.c:643
> msgid "no connection to the server\n"
> msgstr "\n"
>
> ! #: fe-exec.c:650
> msgid "another command is already in progress\n"
> msgstr "\n"
>
> ! #: fe-exec.c:853
> #, c-format
> msgid "message type 0x%02x arrived from server while idle\n"
> msgstr " 0x%02x \n"
>
> ! #: fe-exec.c:896
> #, c-format
> msgid ""
> "unexpected character %c following empty query response (\"I\" message)\n"
> msgstr " %c (\"I\" )\n"
>
> ! #: fe-exec.c:954
> msgid ""
> "server sent data (\"D\" message) without prior row description (\"T\" "
> "message)\n"
> msgstr " (\"D\" ) (\"T\" )\n"
>
> ! #: fe-exec.c:971
> msgid ""
> "server sent binary data (\"B\" message) without prior row description (\"T\" "
> "message)\n"
> msgstr " (\"B\" ) (\"T\" )\n"
>
> ! #: fe-exec.c:987
> #, c-format
> msgid "unexpected response from server; first received character was \"%c\"\n"
> msgstr "; \"%c\"\n"
>
> ! #: fe-exec.c:1281
> #, c-format
> msgid "unexpected asyncStatus: %d\n"
> msgstr " asyncStatus(): %d\n"
>
> ! #: fe-exec.c:1331
> msgid "COPY state must be terminated first\n"
> msgstr "COPY \n"
>
> ! #: fe-exec.c:1682
> msgid "no COPY in progress\n"
> msgstr " COPY\n"
>
> ! #: fe-exec.c:1721
> msgid "lost synchronization with server, resetting connection\n"
> msgstr ", \n"
>
> ! #: fe-exec.c:1786
> msgid "connection in wrong state\n"
> msgstr "\n"
>
> ! #: fe-exec.c:1888 fe-exec.c:1922
> #, c-format
> msgid "protocol error: id=0x%x\n"
> msgstr ": id=0x%x\n"
>
> ! #: fe-exec.c:1957
> msgid "invalid ExecStatusType code"
> msgstr " ExecStatusType "
>
> ! #: fe-exec.c:2010 fe-exec.c:2043
> #, c-format
> msgid "column number %d is out of range 0..%d\n"
> msgstr " %d 0..%d\n"
>
> ! #: fe-exec.c:2032
> #, c-format
> msgid "row number %d is out of range 0..%d\n"
> msgstr " %d 0..%d\n"
>
> ! #: fe-exec.c:2228
> #, c-format
> msgid "could not interpret result from server: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-exec.c:2244
> msgid "no row count available\n"
> msgstr "\n"
>
> --- 173,310 ----
> msgid "expected authentication request from server, but received %c\n"
> msgstr ", %c\n"
>
> ! #: fe-connect.c:1432
> msgid "unexpected message from server during startup\n"
> msgstr "\n"
>
> ! #: fe-connect.c:1491
> #, c-format
> msgid "invalid connection state %c, probably indicative of memory corruption\n"
> msgstr " %c, \n"
>
> ! #: fe-connect.c:1590
> #, c-format
> msgid "invalid setenv state %c, probably indicative of memory corruption\n"
> msgstr " setenv %c, \n"
>
> ! #: fe-connect.c:1630
> #, c-format
> msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
> msgstr " PGCLIENTENCODING : %s\n"
>
> ! #: fe-connect.c:1755
> #, c-format
> msgid "invalid state %c, probably indicative of memory corruption\n"
> msgstr " %c, \n"
>
> ! #: fe-connect.c:2374 fe-connect.c:2383 fe-exec.c:1184 fe-lobj.c:536
> msgid "out of memory\n"
> msgstr "\n"
>
> ! #: fe-connect.c:2422
> #, c-format
> msgid "missing \"=\" after \"%s\" in connection info string\n"
> msgstr " \"%s\" \"=\"\n"
>
> ! #: fe-connect.c:2471
> msgid "unterminated quoted string in connection info string\n"
> msgstr "\n"
>
> ! #: fe-connect.c:2505
> #, c-format
> msgid "invalid connection option \"%s\"\n"
> msgstr " \"%s\"\n"
>
> ! #: fe-connect.c:2720
> msgid "connection pointer is NULL\n"
> msgstr " NULL\n"
>
> ! #: fe-exec.c:633
> msgid "command string is a null pointer\n"
> msgstr "\n"
>
> ! #: fe-exec.c:641
> msgid "no connection to the server\n"
> msgstr "\n"
>
> ! #: fe-exec.c:648
> msgid "another command is already in progress\n"
> msgstr "\n"
>
> ! #: fe-exec.c:846
> #, c-format
> msgid "message type 0x%02x arrived from server while idle\n"
> msgstr " 0x%02x \n"
>
> ! #: fe-exec.c:888
> #, c-format
> msgid ""
> "unexpected character %c following empty query response (\"I\" message)\n"
> msgstr " %c (\"I\" )\n"
>
> ! #: fe-exec.c:945
> msgid ""
> "server sent data (\"D\" message) without prior row description (\"T\" "
> "message)\n"
> msgstr " (\"D\" ) (\"T\" )\n"
>
> ! #: fe-exec.c:962
> msgid ""
> "server sent binary data (\"B\" message) without prior row description (\"T\" "
> "message)\n"
> msgstr " (\"B\" ) (\"T\" )\n"
>
> ! #: fe-exec.c:978
> #, c-format
> msgid "unexpected response from server; first received character was \"%c\"\n"
> msgstr "; \"%c\"\n"
>
> ! #: fe-exec.c:1271
> #, c-format
> msgid "unexpected asyncStatus: %d\n"
> msgstr " asyncStatus(): %d\n"
>
> ! #: fe-exec.c:1321
> msgid "COPY state must be terminated first\n"
> msgstr "COPY \n"
>
> ! #: fe-exec.c:1672
> msgid "no COPY in progress\n"
> msgstr " COPY\n"
>
> ! #: fe-exec.c:1711
> msgid "lost synchronization with server, resetting connection\n"
> msgstr ", \n"
>
> ! #: fe-exec.c:1776
> msgid "connection in wrong state\n"
> msgstr "\n"
>
> ! #: fe-exec.c:1878 fe-exec.c:1912
> #, c-format
> msgid "protocol error: id=0x%x\n"
> msgstr ": id=0x%x\n"
>
> ! #: fe-exec.c:1947
> msgid "invalid ExecStatusType code"
> msgstr " ExecStatusType "
>
> ! #: fe-exec.c:2000 fe-exec.c:2033
> #, c-format
> msgid "column number %d is out of range 0..%d\n"
> msgstr " %d 0..%d\n"
>
> ! #: fe-exec.c:2022
> #, c-format
> msgid "row number %d is out of range 0..%d\n"
> msgstr " %d 0..%d\n"
>
> ! #: fe-exec.c:2217
> #, c-format
> msgid "could not interpret result from server: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-exec.c:2233
> msgid "no row count available\n"
> msgstr "\n"
>
> ***************
> *** 369,375 ****
> msgid "cannot determine OID of function lowrite\n"
> msgstr " lowrite OID\n"
>
> ! #: fe-misc.c:131
> #, c-format
> msgid "could not flush enough data (space available: %d, space needed %d)\n"
> msgstr " (: %d, %d)\n"
> --- 369,375 ----
> msgid "cannot determine OID of function lowrite\n"
> msgstr " lowrite OID\n"
>
> ! #: fe-misc.c:130
> #, c-format
> msgid "could not flush enough data (space available: %d, space needed %d)\n"
> msgstr " (: %d, %d)\n"
> ***************
> *** 384,395 ****
> msgid "integer of size %lu not supported by pqPutInt\n"
> msgstr "pgPutInt %lu \n"
>
> ! #: fe-misc.c:355 fe-misc.c:389 fe-misc.c:778
> #, c-format
> msgid "select() failed: %s\n"
> msgstr "select() : %s\n"
>
> ! #: fe-misc.c:416 fe-misc.c:616 fe-misc.c:757
> msgid "connection not open\n"
> msgstr "\n"
>
> --- 384,395 ----
> msgid "integer of size %lu not supported by pqPutInt\n"
> msgstr "pgPutInt %lu \n"
>
> ! #: fe-misc.c:355 fe-misc.c:389 fe-misc.c:777
> #, c-format
> msgid "select() failed: %s\n"
> msgstr "select() : %s\n"
>
> ! #: fe-misc.c:416 fe-misc.c:616 fe-misc.c:756
> msgid "connection not open\n"
> msgstr "\n"
>
> ***************
> *** 398,404 ****
> msgid "could not receive data from server: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-misc.c:590 fe-misc.c:675
> msgid ""
> "server closed the connection unexpectedly\n"
> "\tThis probably means the server terminated abnormally\n"
> --- 398,404 ----
> msgid "could not receive data from server: %s\n"
> msgstr ": %s\n"
>
> ! #: fe-misc.c:590 fe-misc.c:674
> msgid ""
> "server closed the connection unexpectedly\n"
> "\tThis probably means the server terminated abnormally\n"
> ***************
> *** 408,414 ****
> "\t\n"
> "\n"
>
> ! #: fe-misc.c:691
> #, c-format
> msgid "could not send data to server: %s\n"
> msgstr ": %s\n"
> --- 408,414 ----
> "\t\n"
> "\n"
>
> ! #: fe-misc.c:690
> #, c-format
> msgid "could not send data to server: %s\n"
> msgstr ": %s\n"

> *** zh_CN.po.old Mon Nov 26 20:34:27 2001
> --- zh_CN.po Mon Nov 26 20:35:03 2001
> ***************
> *** 5,12 ****
> msgid ""
> msgstr ""
> "Project-Id-Version: PostgreSQL 7.2\n"
> ! "POT-Creation-Date: 2001-11-18 00:25+0800\n"
> ! "PO-Revision-Date: 2001-10-08 23:32:24+0800\n"
> "Last-Translator: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"
> "Language-Team: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"
> "MIME-Version: 1.0\n"
> --- 5,12 ----
> msgid ""
> msgstr ""
> "Project-Id-Version: PostgreSQL 7.2\n"
> ! "POT-Creation-Date: 2001-11-25 18:48+0800\n"
> ! "PO-Revision-Date: 2001-11-26 20:34:44+0800\n"
> "Last-Translator: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"
> "Language-Team: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"
> "MIME-Version: 1.0\n"

> *** zh_CN.po.old Mon Nov 26 20:30:31 2001
> --- zh_CN.po Mon Nov 26 20:30:40 2001
> ***************
> *** 6,12 ****
> msgid ""
> msgstr ""
> "Project-Id-Version: PostgreSQL 7.2\n"
> ! "POT-Creation-Date: 2001-11-18 00:22+0800\n"
> "PO-Revision-Date: 2001-11-16 20:30:10+0800\n"
> "Last-Translator: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"
> "Language-Team: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"
> --- 6,12 ----
> msgid ""
> msgstr ""
> "Project-Id-Version: PostgreSQL 7.2\n"
> ! "POT-Creation-Date: 2001-11-25 18:39+0800\n"
> "PO-Revision-Date: 2001-11-16 20:30:10+0800\n"
> "Last-Translator: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"
> "Language-Team: Weiping He <laser(at)zhengmai(dot)com(dot)cn>\n"

--
Bruce Momjian | http://candle.pha.pa.us
pgman(at)candle(dot)pha(dot)pa(dot)us | (610) 853-3000
+ If your life is a hard drive, | 830 Blythe Avenue
+ Christ can be your backup. | Drexel Hill, Pennsylvania 19026