From 0f74fb787123b9ee0f6f7eabd1ca5e78ec735be0 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 27 Nov 2001 17:51:54 +0000
Subject: [PATCH] Chinese PO patch

Laser.
---
 doc/FAQ_DEV                   |  98 +++++++++++++++----
 src/interfaces/libpq/zh_CN.po | 174 +++++++++++++++++-----------------
 2 files changed, 162 insertions(+), 110 deletions(-)

diff --git a/doc/FAQ_DEV b/doc/FAQ_DEV
index 9055d38fa78..9bb2701208e 100644
--- a/doc/FAQ_DEV
+++ b/doc/FAQ_DEV
@@ -1,7 +1,7 @@
 
           Developer's Frequently Asked Questions (FAQ) for PostgreSQL
                                        
-   Last updated: Fri Jun 9 21:54:54 EDT 2000
+   Last updated: Mon Nov 26 21:48:19 EST 2001
    
    Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
    
@@ -30,6 +30,7 @@
    14) Why don't we use threads in the backend?
    15) How are RPM's packaged?
    16) How are CVS branches handled?
+   17) How do I get involved in PostgreSQL development?
      _________________________________________________________________
    
   1) What tools are available for developers?
@@ -444,22 +445,22 @@ typedef struct nameData
        
   15) How are RPM's packaged?
   
-   This is from Lamar Owen:
+   This was written by Lamar Owen:
 As to how the RPMs are built -- to answer that question sanely requires
 me to know how much experience you have with the whole RPM paradigm.
 'How is the RPM built?' is a multifaceted question.  The obvious simple
 answer is that I maintain:
-        1.)     A set of patches to make certain portions of the source
-                tree 'behave' in the different environment of the RPMset;
-        2.)     The initscript;
-        3.)     Any other ancilliary scripts and files;
-        4.)     A README.rpm-dist document that tries to adequately document
-                both the differences between the RPM build and the WHY of the
-                differences, as well as useful RPM environment operations
-                (like, using syslog, upgrading, getting postmaster to
-                start at OS boot, etc);
-        5.)     The spec file that throws it all together.  This is not a
-                trivial undertaking in a package of this size.
+    1.) A set of patches to make certain portions of the source
+        tree 'behave' in the different environment of the RPMset;
+    2.) The initscript;
+    3.) Any other ancilliary scripts and files;
+    4.) A README.rpm-dist document that tries to adequately document
+        both the differences between the RPM build and the WHY of the
+        differences, as well as useful RPM environment operations
+        (like, using syslog, upgrading, getting postmaster to
+        start at OS boot, etc);
+    5.) The spec file that throws it all together.  This is not a
+        trivial undertaking in a package of this size.
 
 I then download and build on as many different canonical distributions
 as I can -- currently I am able to build on Red Hat 6.2, 7.0, and 7.1 on
@@ -582,9 +583,9 @@ snapshot whereas a branch is a changeable fileset.)  Rule of thumb is
 that names attached to four-number versions where the third number is
 zero represent branches, the others are just tags.  Here we can see that
 the extant branches are
-        REL7_1_STABLE
-        REL7_0_PATCHES
-        REL6_5_PATCHES
+    REL7_1_STABLE
+    REL7_0_PATCHES
+    REL6_5_PATCHES
 The next commit to the head will be revision 1.107, whereas any changes
 committed into the REL7_1_STABLE branch will have revision numbers like
 1.106.2.*, corresponding to the branch number 1.106.0.2 (don't ask where
@@ -601,17 +602,17 @@ stable branch, you'd better be doubly sure that it's correct.)
 Normally, to checkout the head branch, you just cd to the place you
 want to contain the toplevel "pgsql" directory and say
 
-        cvs ... checkout pgsql
+    cvs ... checkout pgsql
 
 To get a past branch, you cd to whereever you want it and say
 
-        cvs ... checkout -r BRANCHNAME pgsql
+    cvs ... checkout -r BRANCHNAME pgsql
 
 For example, just a couple days ago I did
 
-        mkdir ~postgres/REL7_1
-        cd ~postgres/REL7_1
-        cvs ... checkout -r REL7_1_STABLE pgsql
+    mkdir ~postgres/REL7_1
+    cd ~postgres/REL7_1
+    cvs ... checkout -r REL7_1_STABLE pgsql
 
 and now I have a maintenance copy of 7.1.*.
 
@@ -630,3 +631,58 @@ or two, so that we won't have to double-patch the first wave of fixes.
 
    Also, Ian Lance Taylor points out that branches and tags can be
    distiguished by using "cvs status -v".
+   
+  17) How go I get involved in PostgreSQL development?
+  
+   This was written by Lamar Owen:
+> If someone was interested in joining the development team, where would
+> they...
+> -  Find a description of the open source development process used by the
+> PostgreSQL team.
+
+Read HACKERS for six months (or a full release cycle, whichever is longer).
+Really.  HACKERS _is_the process.  The process is not well documented (AFAIK
+-- it may be somewhere that I am not aware of) -- and it changes continually.
+
+> -  Find the development environment (OS, system, compilers, etc)
+> required to develop code.
+
+Developers Corner on the website has links to this information.  The
+distribution tarball itself includes all the extra tools and documents that
+go beyond a good Unix-like development environment.  In general, a modern
+unix with a modern gcc, GNU make or equivalent, autoconf (of a particular
+version), and good working knowledge of those tools are required.
+
+> -  Find an area or two that needs some support.
+
+The TODO list.
+
+You've made the first step, by finding and subscribing to HACKERS.  Once you
+find an area to look at in the TODO, and have read the documentation on the
+internals, etc, then you check out a current CVS,write what you are going to
+write (keeping your CVS checkout up to date in the process), and make up a
+patch (as a context diff only) and send to the PATCHES list, prefereably.
+
+Discussion on the patch typically happens here.  If the patch adds a major
+feature, it would be a good idea to talk about it first on the HACKERS list,
+in order to increase the chances of it being accepted, as well as toavoid
+duplication of effort.  Note that experienced developers with a proven track
+record usually get the big jobs -- for more than one reason.  Also note that
+PostgreSQL is highly portable -- nonportable code will likely be dismissed
+out of  hand.
+
+Once your contributions get accepted, things move from there. Typically, you
+would be added as a developer on the list on the website when one of the
+other developers recommends it.  Membership on the steering committee is by
+invitation only, by the other steering committee members, from what I have
+gathered watching froma distance.
+
+I make these statements from having watched the process for over two years.
+
+To see a good example of how one goes about this, search the archives for the
+name 'Tom Lane' and see what his first post consisted of, and where he took
+things.  In particular, note that this hasn't been _that_ long ago -- and his
+bugfixing and general deep knowledge with this codebase is legendary.  Take a
+few days to read after him.  And pay special attention to both the sheer
+quantity as well as the painstaking quality of his work.  Both are in high
+demand.
diff --git a/src/interfaces/libpq/zh_CN.po b/src/interfaces/libpq/zh_CN.po
index 9f8ab6a10ab..3aa1f0959ed 100644
--- a/src/interfaces/libpq/zh_CN.po
+++ b/src/interfaces/libpq/zh_CN.po
@@ -1,69 +1,70 @@
 # simplified Chinese translation file for libpq
 # Weiping He <laser@zhengmai.com.cn>, 2001
 #
-#, fuzzy
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/zh_CN.po,v 1.2 2001/11/27 17:51:54 momjian Exp $
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2001-10-01 10:02+0800\n"
-"PO-Revision-Date: 2001-10-01 23:42:27+0800\n"
+"POT-Creation-Date: 2001-11-27 20:20+0800\n"
+"PO-Revision-Date: 2001-11-27 20:22:06+0800\n"
 "Last-Translator: Weiping He <laser@zhengmai.com.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=gb_2312\n"
+"Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fe-auth.c:229
+#: fe-auth.c:228
 #, c-format
 msgid "Kerberos 4 error: %s\n"
 msgstr "Kerberos 4 ����: %s\n"
 
-#: fe-auth.c:393
+#: fe-auth.c:391
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "�޷����׽�������Ϊ����ģʽ: %s\n"
 
-#: fe-auth.c:409
+#: fe-auth.c:407
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "kerberos 5 ��֤�ܾ�: %*s\n"
 
-#: fe-auth.c:429
+#: fe-auth.c:427
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr "�޷����׽���: %s �ϻظ�������ģʽ\n"
+msgstr "�޷����׽���: %s �ϻָ�������ģʽ\n"
 
-#: fe-auth.c:573
+#: fe-auth.c:490
+msgid "SCM_CRED authentication method not supported\n"
+msgstr "��֧�� SCM_CRED ��֤��ʽ\n"
+
+#: fe-auth.c:576
 msgid "Kerberos 4 authentication failed\n"
 msgstr "Kerberos 4 ��֤ʧ��\n"
 
-#: fe-auth.c:579
+#: fe-auth.c:582
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "��֧�� Kerberos 4 ��֤\n"
 
-#: fe-auth.c:590
+#: fe-auth.c:593
 msgid "Kerberos 5 authentication failed\n"
 msgstr "Kerberos 5 ��֤ʧ��\n"
 
-#: fe-auth.c:596
+#: fe-auth.c:599
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "��֧�� Kerberos 5 ��֤\n"
 
-#: fe-auth.c:623
-msgid "SCM_CRED authentication method not supported\n"
-msgstr "��֧�� SCM_CRED ��֤��ʽ\n"
-
-#: fe-auth.c:630
+#: fe-auth.c:627
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "��֧�� %u ��֤��ʽ\n"
 
-#: fe-auth.c:667
+#: fe-auth.c:664
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
 msgstr "���ԷǷ���֤������ \"%s\"\n"
 
-#: fe-auth.c:724
+#: fe-auth.c:721
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ��Ч����֤ϵͳ: %d\n"
@@ -72,17 +73,17 @@ msgstr "fe_getauthname: 
 msgid "could not determine the PostgreSQL user name to use\n"
 msgstr "�޷��ж�Ҫʹ�õ� PostgreSQL �û���\n"
 
-#: fe-connect.c:705
+#: fe-connect.c:703
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "�޷����׽�������Ϊ������ģʽ: %s\n"
 
-#: fe-connect.c:729
+#: 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:749
+#: fe-connect.c:747
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -93,7 +94,7 @@ msgstr ""
 "\t�������Ƿ��ڱ������в����� Unix ���׽���\n"
 "\t\"%s\"��׼����������?\n"
 
-#: fe-connect.c:758
+#: fe-connect.c:756
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -104,47 +105,47 @@ msgstr ""
 "\t�������Ƿ������� %s �����в���׼�������ڶ˿�\n"
 "%s �ϵ� TCP/IP ����?\n"
 
-#: fe-connect.c:823
+#: fe-connect.c:820
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "��Ч��������ַ: %s\n"
 
-#: fe-connect.c:842
+#: fe-connect.c:839
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "δ֪������: %s\n"
 
-#: fe-connect.c:884
+#: fe-connect.c:881
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "�޷������׽���: %s\n"
 
-#: fe-connect.c:947
+#: fe-connect.c:944
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "�޷����� SSL ���ְ�: %s\n"
 
-#: fe-connect.c:955
+#: 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:969
+#: fe-connect.c:966
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "�޷����� SSL ����: %s\n"
 
-#: fe-connect.c:979
+#: fe-connect.c:976
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "�޷����� SSL ����: %s\n"
 
-#: fe-connect.c:997
+#: fe-connect.c:999
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "�յ��� SSL ���ֵ���Ч��Ӧ: %c\n"
 
-#: fe-connect.c:1006
+#: fe-connect.c:1008
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "��������֧�� SSL, ����Ҫ��ʹ�� SSL\n"
 
@@ -172,208 +173,203 @@ msgstr "
 msgid "expected authentication request from server, but received %c\n"
 msgstr "�ڴ����Է���������֤����, ȴ�յ� %c\n"
 
-#: fe-connect.c:1433
+#: fe-connect.c:1432
 msgid "unexpected message from server during startup\n"
 msgstr "�����������յ����Է������ķ�Ԥ����Ϣ\n"
 
-#: fe-connect.c:1492
+#: fe-connect.c:1491
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "��Ч������״̬ %c, �����Ǵ洢�����ݱ��ƻ��ı�־\n"
 
-#: fe-connect.c:1592
+#: fe-connect.c:1590
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr "��Ч�� setenv ״̬  %c, �����Ǵ洢�����ݱ��ƻ��ı�־\n"
 
-#: fe-connect.c:1633
+#: fe-connect.c:1630
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "�� PGCLIENTENCODING �еķǷ�������: %s\n"
 
-#: fe-connect.c:1758
+#: fe-connect.c:1755
 #, 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:1128 fe-lobj.c:527
+#: 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:2427
+#: fe-connect.c:2422
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "��������Ϣ�ִ���� \"%s\" ����ȱ�� \"=\"\n"
 
-#: fe-connect.c:2476
+#: fe-connect.c:2471
 msgid "unterminated quoted string in connection info string\n"
 msgstr "������Ϣ�ִ���δ�����������ִ�\n"
 
-#: fe-connect.c:2510
+#: fe-connect.c:2505
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "�Ƿ�����ѡ�� \"%s\"\n"
 
-#: fe-connect.c:2695
+#: fe-connect.c:2720
 msgid "connection pointer is NULL\n"
 msgstr "����ָ���� NULL\n"
 
-#: fe-exec.c:570
+#: fe-exec.c:633
 msgid "command string is a null pointer\n"
 msgstr "�����ִ���һ����ָ��\n"
 
-#: fe-exec.c:578
+#: fe-exec.c:641
 msgid "no connection to the server\n"
 msgstr "û�е�������������\n"
 
-#: fe-exec.c:585
+#: fe-exec.c:648
 msgid "another command is already in progress\n"
 msgstr "�Ѿ�������һ�������ڴ���\n"
 
-#: fe-exec.c:788
+#: fe-exec.c:846
 #, c-format
 msgid "message type 0x%02x arrived from server while idle\n"
 msgstr "����ʱ�ӷ���������������Ϊ 0x%02x ����Ϣ\n"
 
-#: fe-exec.c:831
+#: fe-exec.c:888
 #, c-format
 msgid ""
 "unexpected character %c following empty query response (\"I\" message)\n"
-msgstr ""
-"�ڿյIJ�ѯ��Ӧ������ŷ�Ԥ�ڵ��ַ� %c (\"I\" ��Ϣ)\n"
+msgstr "�ڿյIJ�ѯ��Ӧ������ŷ�Ԥ�ڵ��ַ� %c (\"I\" ��Ϣ)\n"
 
-#: fe-exec.c:889
+#: fe-exec.c:945
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
 "message)\n"
-msgstr ""
-"��������û�з�����������ǰ���·������� (\"D\" ��Ϣ) (\"T\" "
-"��Ϣ)\n"
+msgstr "��������û�з�����������ǰ���·������� (\"D\" ��Ϣ) (\"T\" ��Ϣ)\n"
 
-#: fe-exec.c:906
+#: fe-exec.c:962
 msgid ""
 "server sent binary data (\"B\" message) without prior row description (\"T\" "
 "message)\n"
-msgstr ""
-"��������û�з�����������ǰ���·������� (\"B\" ��Ϣ) (\"T\" "
-"��Ϣ)\n"
+msgstr "��������û�з�����������ǰ���·������� (\"B\" ��Ϣ) (\"T\" ��Ϣ)\n"
 
-#: fe-exec.c:922
+#: fe-exec.c:978
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "���Է�������������Ӧ; �յ��ĵ�һ���ַ��� \"%c\"\n"
 
-#: fe-exec.c:1216
+#: fe-exec.c:1271
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "����� asyncStatus(�첽״̬): %d\n"
 
-#: fe-exec.c:1266
+#: fe-exec.c:1321
 msgid "COPY state must be terminated first\n"
 msgstr "COPY ״̬�����Ƚ���\n"
 
-#: fe-exec.c:1617
+#: fe-exec.c:1672
 msgid "no COPY in progress\n"
 msgstr "û�����ڴ����� COPY\n"
 
-#: fe-exec.c:1656
+#: fe-exec.c:1711
 msgid "lost synchronization with server, resetting connection\n"
 msgstr "ʧȥ���������ͬ��, ��������\n"
 
-#: fe-exec.c:1721
+#: fe-exec.c:1776
 msgid "connection in wrong state\n"
 msgstr "���Ӵ��ڴ���״̬\n"
 
-#: fe-exec.c:1823 fe-exec.c:1857
+#: 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:1892
+#: fe-exec.c:1947
 msgid "invalid ExecStatusType code"
 msgstr "�Ƿ� ExecStatusType ����"
 
-#: fe-exec.c:1945 fe-exec.c:1978
+#: 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:1967
+#: 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:2163
+#: fe-exec.c:2217
 #, c-format
 msgid "could not interpret result from server: %s\n"
 msgstr "�޷��������Է������Ľ��: %s\n"
 
-#: fe-exec.c:2179
+#: fe-exec.c:2233
 msgid "no row count available\n"
 msgstr "û�пɻ�õ�����\n"
 
-#: fe-lobj.c:398 fe-lobj.c:477
+#: fe-lobj.c:400 fe-lobj.c:483
 #, c-format
 msgid "could not open file \"%s\": %s\n"
 msgstr "�޷����ļ� \"%s\": %s\n"
 
-#: fe-lobj.c:410
+#: fe-lobj.c:412
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
 msgstr "�޷�Ϊ�ļ� \"%s\" ���������\n"
 
-#: fe-lobj.c:419 fe-lobj.c:466
+#: fe-lobj.c:422 fe-lobj.c:472
 #, c-format
 msgid "could not open large object %u\n"
 msgstr "�޷��򿪴���� %u\n"
 
-#: fe-lobj.c:433
+#: fe-lobj.c:437
 #, c-format
 msgid "error while reading file \"%s\"\n"
 msgstr "��ȡ�ļ� \"%s\" ʱ����\n"
 
-#: fe-lobj.c:491
+#: fe-lobj.c:498
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "д���ļ� \"%s\" ʱ����\n"
 
-#: fe-lobj.c:555
+#: fe-lobj.c:564
 msgid "query to initialize large object functions did not return data\n"
 msgstr "��ʼ����������IJ�ѯû�з�������\n"
 
-#: fe-lobj.c:593
+#: fe-lobj.c:602
 msgid "cannot determine OID of function lo_open\n"
 msgstr "�޷��жϺ��� lo_open �� OID\n"
 
-#: fe-lobj.c:600
+#: fe-lobj.c:609
 msgid "cannot determine OID of function lo_close\n"
 msgstr "�޷��жϺ��� lo_close �� OID\n"
 
-#: fe-lobj.c:607
+#: fe-lobj.c:616
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "�޷��жϺ��� lo_creat �� OID\n"
 
-#: fe-lobj.c:614
+#: fe-lobj.c:623
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "�޷��жϺ��� lo_unlink �� OID\n"
 
-#: fe-lobj.c:621
+#: fe-lobj.c:630
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "�޷��жϺ��� lo_lseek �� OID\n"
 
-#: fe-lobj.c:628
+#: fe-lobj.c:637
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "�޷��жϺ��� lo_tell �� OID\n"
 
-#: fe-lobj.c:635
+#: fe-lobj.c:644
 msgid "cannot determine OID of function loread\n"
 msgstr "�޷��жϺ��� loread �� OID\n"
 
-#: fe-lobj.c:642
+#: fe-lobj.c:651
 msgid "cannot determine OID of function lowrite\n"
 msgstr "�޷��жϺ��� lowrite �� OID\n"
 
-#: fe-misc.c:131
+#: fe-misc.c:130
 #, c-format
 msgid "could not flush enough data (space available: %d, space needed %d)\n"
 msgstr "�޷���ˢ�㹻������ (���ÿռ�: %d, ��Ҫ�ռ� %d)\n"
@@ -388,12 +384,12 @@ msgstr "pgGetInt 
 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
+#: 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:757
+#: fe-misc.c:416 fe-misc.c:616 fe-misc.c:756
 msgid "connection not open\n"
 msgstr "�����\n"
 
@@ -402,7 +398,7 @@ msgstr "
 msgid "could not receive data from server: %s\n"
 msgstr "�޷��ӷ�������������: %s\n"
 
-#: fe-misc.c:590 fe-misc.c:675
+#: fe-misc.c:590 fe-misc.c:674
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -412,7 +408,7 @@ msgstr ""
 "\t��������ͨ����ζ�ŷ������ڴ�������֮ǰ\n"
 "�������ڴ��������ʱ��������ֹ\n"
 
-#: fe-misc.c:691
+#: fe-misc.c:690
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "�޷����������������: %s\n"
-- 
GitLab