diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index ac9d52c47c4e315471f5c375c724805c54128fdb..e5b4d1fc99aae692e73369a1d4d2c604a76b2534 100644
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.7 2004/07/25 12:00:06 petere Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.8 2004/07/30 05:28:31 petere Exp $
 CATALOG_NAME	:= initdb
-AVAIL_LANGUAGES	:= de fr it pt_BR ru sv
+AVAIL_LANGUAGES	:= de fr it pt_BR ru sv zh_TW
 GETTEXT_FILES	:= initdb.c
 GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/initdb/po/zh_TW.po b/src/bin/initdb/po/zh_TW.po
new file mode 100644
index 0000000000000000000000000000000000000000..7b6f793d6ae2c5f0479ec19f6d6bc839404ec9d9
--- /dev/null
+++ b/src/bin/initdb/po/zh_TW.po
@@ -0,0 +1,477 @@
+# Traditional Chinese translation for initdb.
+# 2004-07-30 Zhenbang Wei <forth@zbwei.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.5\n"
+"POT-Creation-Date: 2004-07-29 01:10-0300\n"
+"PO-Revision-Date: 2004-07-30 10:21+0800\n"
+"Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
+"Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=Big5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: initdb.c:223
+#: initdb.c:237
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: �O����κ�\n"
+
+#: initdb.c:343
+#: initdb.c:1305
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: �L�k�}���ɮ�\"%s\"Ū�����: %s\n"
+
+#: initdb.c:401
+#, c-format
+msgid "%s: could not open file \"%s\" for writing: %s\n"
+msgstr "%s: �L�k�}���ɮ�\"%s\"�g�J���: %s\n"
+
+#: initdb.c:529
+#: initdb.c:538
+#: initdb.c:546
+#, c-format
+msgid "%s: failed\n"
+msgstr "%s: ����\n"
+
+#: initdb.c:535
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: ������ƥؿ� \"%s\"\n"
+
+#: initdb.c:543
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: ������ƥؿ� \"%s\" �����e\n"
+
+#: initdb.c:554
+#, c-format
+msgid "%s: data directory \"%s\" not removed at user's request\n"
+msgstr "%s: �L�k�̨ϥΪ̪��n�D������ƥؿ� \"%s\"\n"
+
+#: initdb.c:580
+#, c-format
+msgid ""
+"%s: cannot be run as root\n"
+"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
+"own the server process.\n"
+msgstr ""
+"%s: �L�k�Hroot��������\n"
+"�ХH�N�|�֦����A����{���D�S�v�ϥΪ̵n�J(�Ҧp��\"su\")�C\n"
+
+#: initdb.c:631
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" ���O�������A���s�X�W��\n"
+
+#: initdb.c:786
+#, c-format
+msgid "%s: warning: encoding mismatch\n"
+msgstr "%s: ĵ�i�G�s�X����\n"
+
+#: initdb.c:788
+#, c-format
+msgid ""
+"The encoding you selected (%s) and the encoding that the selected\n"
+"locale uses (%s) are not known to match.  This may lead to\n"
+"misbehavior in various character string processing functions.  To fix\n"
+"this situation, rerun %s and either do not specify an encoding\n"
+"explicitly, or choose a matching combination.\n"
+msgstr ""
+"�A��ܪ��s�X(%s)�Mlocale�ϥΪ��s�X(%s)���šA�o�˥i��|����\n"
+"�r�B�z�禡�X�{���`�欰�A�n�ץ��o�Ӱ��D�A�Э��s���� %s �B\n"
+"�����w�ϥΪ��s�X�άO���w���T���s�X�զX�C\n"
+
+#: initdb.c:940
+#, c-format
+msgid ""
+"%s: file \"%s\" does not exist\n"
+"This means you have a corrupted installation or identified\n"
+"the wrong directory with the invocation option -L.\n"
+msgstr ""
+"%s: �ɮ� \"%s\" ���s�b\n"
+"�o���ܧA���w�˥i��o�Ϳ��~�A�άO���w�F���~��\n"
+"�ؿ����ﶵ -L�C\n"
+
+#: initdb.c:1005
+msgid "selecting default max_connections ... "
+msgstr "��ܹw�]�� max_connections ..."
+
+#: initdb.c:1041
+msgid "selecting default shared_buffers ... "
+msgstr "��ܹw�]�� shared_buffers ..."
+
+#: initdb.c:1074
+msgid "creating configuration files ... "
+msgstr "�إ߳]�w��..."
+
+#: initdb.c:1152
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "�إ� template1 ��Ʈw�� %s/base/1 ... "
+
+#: initdb.c:1168
+#, c-format
+msgid ""
+"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
+"Check your installation or specify the correct path using the option -L.\n"
+msgstr ""
+"%s: ��J�� \"%s\" ���ݩ� PostgreSQL %s\n"
+"���ˬd�A���w�˩Υ� -L �ﶵ���w���T�����|�C\n"
+
+#: initdb.c:1244
+msgid "initializing pg_shadow ... "
+msgstr "��l��pg_shadow..."
+
+#: initdb.c:1280
+msgid "Enter new superuser password: "
+msgstr "��J�s���޲z�̱K�X:"
+
+#: initdb.c:1281
+msgid "Enter it again: "
+msgstr "�A��J�@��:"
+
+#: initdb.c:1284
+msgid "Passwords didn't match.\n"
+msgstr "�K�X���šC\n"
+
+#: initdb.c:1311
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: �L�k�q�ɮ� \"%s\" Ū���K�X: %s\n"
+
+#: initdb.c:1324
+msgid "setting password ... "
+msgstr "�]�w�K�X..."
+
+#: initdb.c:1348
+#, c-format
+msgid "%s: The password file was not generated. Please report this problem.\n"
+msgstr "%s: �L�k���ͱK�X�ɡA�Ц^���o�ӿ��~�C\n"
+
+#: initdb.c:1378
+msgid "enabling unlimited row size for system tables ... "
+msgstr "�ҥΨt�θ�ƪ��L��j�p���� ..."
+
+#: initdb.c:1451
+msgid "initializing pg_depend ... "
+msgstr "��l��pg_depend..."
+
+#: initdb.c:1479
+msgid "creating system views ... "
+msgstr "�إߨt���˵�..."
+
+#: initdb.c:1516
+msgid "loading pg_description ... "
+msgstr "���Jpg_description..."
+
+#: initdb.c:1564
+msgid "creating conversions ... "
+msgstr "�إ� conversions ... "
+
+#: initdb.c:1620
+msgid "setting privileges on built-in objects ... "
+msgstr "�]�w���ت����v�� ... "
+
+#: initdb.c:1678
+msgid "creating information schema ... "
+msgstr "�إ� information schema ... "
+
+#: initdb.c:1740
+msgid "vacuuming database template1 ... "
+msgstr "�����Ʈw template1 ..."
+
+#: initdb.c:1796
+msgid "copying template1 to template0 ... "
+msgstr "�ƻs template1 �� template0 ..."
+
+#: initdb.c:1853
+msgid "caught signal\n"
+msgstr "������H��\n"
+
+#: initdb.c:1858
+msgid "could not write to child process\n"
+msgstr "�L�k�g�ܤl��{\n"
+
+#: initdb.c:1864
+msgid "ok\n"
+msgstr "���\\n"
+
+#: initdb.c:1894
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: �L��locale�W�� \"%s\"\n"
+
+#: initdb.c:1961
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s ��l��PostgreSQL��Ʈwcluster.\n"
+"\n"
+
+#: initdb.c:1962
+msgid "Usage:\n"
+msgstr "�Ϊk:\n"
+
+#: initdb.c:1963
+#, c-format
+msgid "  %s [OPTION]... [DATADIR]\n"
+msgstr "  %s [�ﶵ]... [��ƥؿ�]\n"
+
+#: initdb.c:1964
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"�ﶵ:\n"
+
+#: initdb.c:1965
+msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
+msgstr " [-D, --pgdata=]DATADIR     ��Ʈwcluster���ؿ�\n"
+
+#: initdb.c:1966
+msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
+msgstr "  -E, --encoding=ENCODING   �s��Ʈw���w�]�s�X\n"
+
+#: initdb.c:1967
+msgid "  --locale=LOCALE           initialize database cluster with given locale\n"
+msgstr "  --locale=LOCALE           �H���w��locale��l�Ƹ�Ʈwcluster\n"
+
+#: initdb.c:1968
+msgid ""
+"  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
+"  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
+"                            initialize database cluster with given locale\n"
+"                            in the respective category (default taken from\n"
+"                            environment)\n"
+msgstr ""
+"  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
+"  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
+"                            ���w���P������locale�H��l�Ƹ�Ʈwcluster\n"
+"                            (�w�]�q�����ܼƨ��o)\n"
+
+#: initdb.c:1973
+msgid "  --no-locale               equivalent to --locale=C\n"
+msgstr "  --no-locale               �\��P --locale=C\n"
+
+#: initdb.c:1974
+msgid "  -U, --username=NAME       database superuser name\n"
+msgstr "  -U, --username=NAME       ��Ʈw�޲z�̦W��\n"
+
+#: initdb.c:1975
+msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
+msgstr "  -W, --pwprompt            �߰ݷs�޲z�̪��K�X\n"
+
+#: initdb.c:1976
+msgid "  --pwfile=filename         read password for the new superuser from file\n"
+msgstr "  --pwfile=filename         �q�ɮ�Ū���s�޲z�̪��K�X\n"
+
+#: initdb.c:1977
+msgid "  -?, --help                show this help, then exit\n"
+msgstr "  -?, --help                ��ܳo�������M�ᵲ��\n"
+
+#: initdb.c:1978
+msgid "  -V, --version             output version information, then exit\n"
+msgstr "  -V, --version             ��ܪ�����T�M�ᵲ��\n"
+
+#: initdb.c:1979
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+"�D�`�οﶵ:\n"
+
+#: initdb.c:1980
+msgid "  -d, --debug               generate lots of debugging output\n"
+msgstr "  -d, --debug               ��ܰ����T��\n"
+
+#: initdb.c:1981
+msgid "  -s, --show                show internal settings\n"
+msgstr "  -s, --show                ��ܤ����]�w\n"
+
+#: initdb.c:1982
+msgid "  -L DIRECTORY              where to find the input files\n"
+msgstr "  -L DIRECTORY              where to find the input files\n"
+
+#: initdb.c:1983
+msgid "  -n, --noclean             do not clean up after errors\n"
+msgstr "  -n, --noclean             �o�Ϳ��~�ɤ����M�z\n"
+
+#: initdb.c:1984
+msgid ""
+"\n"
+"If the data directory is not specified, the environment variable PGDATA\n"
+"is used.\n"
+msgstr ""
+"\n"
+"�p�G�S�����w��ƥؿ��N�|�ϥ������ܼ�PGDATA�C\n"
+
+#: initdb.c:1986
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"�^�����~�� <pgsql-bugs@postgresql.org>�C\n"
+
+#: initdb.c:2073
+msgid "Running in debug mode.\n"
+msgstr "�H�����Ҧ�����C\n"
+
+#: initdb.c:2077
+msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
+msgstr "�Hnoclean�Ҧ�����A�o�Ϳ��~�ɤ��|�M�z�C\n"
+
+#: initdb.c:2113
+#: initdb.c:2130
+#: initdb.c:2298
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "����\"%s --help\"���o��h��T�C\n"
+
+#: initdb.c:2128
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: �R�O�C�ѼƹL�h(�Ĥ@�ӬO \"%s\")\n"
+
+#: initdb.c:2136
+#, c-format
+msgid "%s: you cannot specify both password prompt and password file\n"
+msgstr "%s: ����P�ɨϥθ߰ݱK�X�M���w�K�X��\n"
+
+#: initdb.c:2151
+#, c-format
+msgid ""
+"%s: no data directory specified\n"
+"You must identify the directory where the data for this database system\n"
+"will reside.  Do this with either the invocation option -D or the\n"
+"environment variable PGDATA.\n"
+msgstr ""
+"%s: �����w��ƥؿ�\n"
+"�A�������w��Ʈw�t�Φs���ƪ��ؿ��A�A�i�H�ϥ� -D �ﶵ\n"
+"�άO�����ܼ�PGDATA�C\n"
+
+#: initdb.c:2177
+#, c-format
+msgid ""
+"The program \"postgres\" is needed by %s but was not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s �ݭn�{�� \"postgres\"�A���O�b�P\"%s\"�ۦP���ؿ����䤣��C\n"
+"���ˬd�A���w�ˡC\n"
+
+#: initdb.c:2183
+#, c-format
+msgid ""
+"The program \"postgres\" was found by %s but was not the same version as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s �w���{��\"postgres\"�A���O�P\"%s\"���������šC\n"
+"���ˬd�A���w�ˡC\n"
+
+#: initdb.c:2204
+#, c-format
+msgid "%s: could not determine valid short version string\n"
+msgstr "%s: �L�k���o�u�����r��\n"
+
+#: initdb.c:2257
+#, c-format
+msgid ""
+"The files belonging to this database system will be owned by user \"%s\".\n"
+"This user must also own the server process.\n"
+"\n"
+msgstr ""
+"�ϥΪ�\"%s\"�N�|������Ʈw�t���ɮשM���A����{���֦��̡C\n"
+"\n"
+
+#: initdb.c:2268
+#, c-format
+msgid "The database cluster will be initialized with locale %s.\n"
+msgstr "��Ʈwcluster�|�Hlocale %s��l�ơC\n"
+
+#: initdb.c:2272
+#, c-format
+msgid ""
+"The database cluster will be initialized with locales\n"
+"  COLLATE:  %s\n"
+"  CTYPE:    %s\n"
+"  MESSAGES: %s\n"
+"  MONETARY: %s\n"
+"  NUMERIC:  %s\n"
+"  TIME:     %s\n"
+msgstr ""
+"��Ʈwcluster�|�H�U�Clocale��l��\n"
+"  COLLATE:  %s\n"
+"  CTYPE:    %s\n"
+"  MESSAGES: %s\n"
+"  MONETARY: %s\n"
+"  NUMERIC:  %s\n"
+"  TIME:     %s\n"
+
+#: initdb.c:2296
+#, c-format
+msgid "%s: could not find suitable encoding for locale \"%s\"\n"
+msgstr "%s: �䤣��A�X���s�X��locale \"%s\"\n"
+
+#: initdb.c:2297
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "�� -E �ﶵ���s���� %s�C\n"
+
+#: initdb.c:2304
+#, c-format
+msgid "The default database encoding has accordingly been set to %s.\n"
+msgstr "�w�]��Ʈw�s�X�Q�]�� %s�C\n"
+
+#: initdb.c:2345
+#, c-format
+msgid "creating directory %s ... "
+msgstr "�إߥؿ� %s ..."
+
+#: initdb.c:2359
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "�ץ��{���ؿ� %s ���v��..."
+
+#: initdb.c:2377
+#, c-format
+msgid ""
+"%s: directory \"%s\" exists but is not empty\n"
+"If you want to create a new database system, either remove or empty\n"
+"the directory \"%s\" or run %s\n"
+"with an argument other than \"%s\".\n"
+msgstr ""
+"%s: �ؿ�\"%s\"���O�Ū�\n"
+"�p�G�A�Q�إ߷s����Ʈw�t�ΡA�бN�ؿ�\"%s\"�R���βM�šA\n"
+"�άO�b���� %s �ɥ[�W\"%s\"�H�~���ѼơC\n"
+
+#: initdb.c:2394
+#, c-format
+msgid "creating directory %s/%s ... "
+msgstr "�إߥؿ� %s/%s ..."
+
+#: initdb.c:2452
+#, c-format
+msgid ""
+"\n"
+"Success. You can now start the database server using:\n"
+"\n"
+"    %s%s%s/postmaster -D %s%s%s\n"
+"or\n"
+"    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n"
+"\n"
+msgstr ""
+"\n"
+"���榨�\�A�{�b�A�i�H�ΤU�C�R�O�Ұʸ�Ʈw���A��:\n"
+"\n"
+"    %s%s%s/postmaster -D %s%s%s\n"
+"��\n"
+"    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n"
+"\n"
+
diff --git a/src/bin/pg_controldata/po/zh_TW.po b/src/bin/pg_controldata/po/zh_TW.po
index 66efd851235d7b27efc1a932d8709eb62d8283dc..63ab0730d8142b3af44a5a99a6917394f9bbaa56 100644
--- a/src/bin/pg_controldata/po/zh_TW.po
+++ b/src/bin/pg_controldata/po/zh_TW.po
@@ -1,17 +1,16 @@
-# Traditional Chinese translation file for pg_controldata
-# 2003-11-25 Zhenbang Wei <forth@zbwei.net>
-# 
+# Traditional Chinese translation file for pg_controldata.
+# 2004-07-30 Zhenbang Wei <forth@zbwei.net>
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2003-11-25 04:33-0400\n"
-"PO-Revision-Date: 2003-11-25 09:26+0800\n"
+"Project-Id-Version: PostgreSQL 7.5\n"
+"POT-Creation-Date: 2004-07-29 19:15-0300\n"
+"PO-Revision-Date: 2004-07-30 11:06+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=Big5\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: pg_controldata.c:28
 #, c-format
@@ -19,7 +18,7 @@ msgid ""
 "%s displays control information of a PostgreSQL database cluster.\n"
 "\n"
 msgstr ""
-"%s ���PostgreSQL��Ʈw�O������T���C\n"
+"%s ���PostgreSQL��Ʈwcluster�����T�C\n"
 "\n"
 
 #: pg_controldata.c:32
@@ -49,12 +48,12 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"�p�G�S�����w��Ʀs��ؿ��A�h�ϥ������ܼ�PGDATA�C\n"
+"�p�G�S�����w��ƥؿ��N�|�ϥ������ܼ�PGDATA�C\n"
 "\n"
 
 #: pg_controldata.c:42
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "�N���~�^����<pgsql-bugs@postgresql.org>.\n"
+msgstr "�^�����~��<pgsql-bugs@postgresql.org>�C\n"
 
 #: pg_controldata.c:52
 msgid "starting up"
@@ -80,27 +79,27 @@ msgstr "
 msgid "unrecognized status code"
 msgstr "�L�k�ѧO�����A�X"
 
-#: pg_controldata.c:107
+#: pg_controldata.c:104
 #, c-format
 msgid "%s: no data directory specified\n"
-msgstr "%s: �S�����w��Ʀs��ؿ�\n"
+msgstr "%s: �S�����w��ƥؿ�\n"
 
-#: pg_controldata.c:108
+#: pg_controldata.c:105
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "��\"%s --help\"��ܧ�h�T���C\n"
+msgstr "����\"%s --help\"��ܧ�h��T�C\n"
 
-#: pg_controldata.c:116
+#: pg_controldata.c:113
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: �L�k�}���ɮ�\"%s\"�HŪ��: %s\n"
 
-#: pg_controldata.c:123
+#: pg_controldata.c:120
 #, c-format
 msgid "%s: could not read file \"%s\": %s\n"
 msgstr "%s: �L�kŪ���ɮ�\"%s\": %s\n"
 
-#: pg_controldata.c:137
+#: pg_controldata.c:134
 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"
@@ -112,120 +111,131 @@ msgstr ""
 "�����G�O���i�H�઺�C\n"
 "\n"
 
-#: pg_controldata.c:150
+#: pg_controldata.c:153
 #, c-format
 msgid "pg_control version number:            %u\n"
-msgstr "pg_control ����:                      %u\n"
+msgstr "pg_control�������X:                   %u\n"
 
-#: pg_controldata.c:151
+#: pg_controldata.c:154
 #, c-format
 msgid "Catalog version number:               %u\n"
-msgstr "Catalog ����:                         %u\n"
+msgstr "catalog�������X:                      %u\n"
+
+#: pg_controldata.c:155
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "��Ʈw�t���ѧO�W��:                   %s\n"
 
-#: pg_controldata.c:152
+#: pg_controldata.c:156
 #, c-format
 msgid "Database cluster state:               %s\n"
-msgstr "��Ʈw�O�����A:                         %s\n"
+msgstr "��Ʈwcluster���A:                    %s\n"
 
-#: pg_controldata.c:153
+#: pg_controldata.c:157
 #, c-format
 msgid "pg_control last modified:             %s\n"
-msgstr "pg_control�̫�ק�:                  %s\n"
+msgstr "pg_control�̫�ק�ɶ�:               %s\n"
 
-#: pg_controldata.c:154
+#: pg_controldata.c:158
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "�ثe����x��ID:                       %u\n"
 
-#: pg_controldata.c:155
+#: pg_controldata.c:159
 #, c-format
 msgid "Next log file segment:                %u\n"
-msgstr "�U�@�Ӥ�x�ɮװϬq:                     %u\n"
+msgstr "�U�@�Ӥ�x�ɮװϬq:                   %u\n"
 
-#: pg_controldata.c:156
+#: pg_controldata.c:160
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
-msgstr "�̷s���ˬd�I��m:                       %X/%X\n"
+msgstr "�̷s���ˬd�I��m:                     %X/%X\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:162
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
-msgstr "�e�@���ˬd�I��m:                       %X/%X\n"
+msgstr "�e�@���ˬd�I��m:                     %X/%X\n"
 
-#: pg_controldata.c:160
+#: pg_controldata.c:164
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
-msgstr "�̷s�ˬd�I��REDO��m:               %X/%X\n"
+msgstr "�̷s���ˬd�IREDO��m:                 %X/%X\n"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:166
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
-msgstr "�̷s�ˬd�I��UNDO��m:               %X/%X\n"
+msgstr "�̷s���ˬd�IUNDO��m:                 %X/%X\n"
 
-#: pg_controldata.c:164
+#: pg_controldata.c:168
 #, c-format
-msgid "Latest checkpoint's StartUpID:        %u\n"
-msgstr "�̷s�ˬd�I��StartUpID:               %u\n"
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr "�̷s���ˬd�ITimeLineID:               %u\n"
 
-#: pg_controldata.c:165
+#: pg_controldata.c:169
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
-msgstr "�̷s�ˬd�I��NextXID:                 %u\n"
+msgstr "�̷s���ˬd�INextXID:                  %u\n"
 
-#: pg_controldata.c:166
+#: pg_controldata.c:170
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
-msgstr "�̷s�ˬd�I��NextOID:                 %u\n"
+msgstr "�̷s���ˬd�INextOID:                  %u\n"
 
-#: pg_controldata.c:167
+#: pg_controldata.c:171
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
-msgstr "�̷s�ˬd�I���ɶ�:                     %s\n"
+msgstr "�̷s���ˬd�I�ɶ�:                     %s\n"
 
-#: pg_controldata.c:168
+#: pg_controldata.c:172
 #, c-format
 msgid "Database block size:                  %u\n"
-msgstr "��Ʈw�϶��j�p:                         %u\n"
+msgstr "��Ʈw�϶��j�p:                       %u\n"
 
-#: pg_controldata.c:169
+#: pg_controldata.c:173
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
-msgstr "�j�����p�C�@�q���϶���:                     %u\n"
+msgstr "large relation�C�ӰϬq���϶���:       %u\n"
 
-#: pg_controldata.c:170
+#: pg_controldata.c:174
+#, c-format
+msgid "Bytes per WAL segment:                %u\n"
+msgstr "�C��WAL�Ϭq���줸�ռ�:                %u\n"
+
+#: pg_controldata.c:175
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "�ѧO�r���̤j����:                     %u\n"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:176
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "�禡�Ѽƪ��̤j�Ӽ�:                   %u\n"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:177
 #, c-format
 msgid "Date/time type storage:               %s\n"
-msgstr "���/�ɶ������x�s:                   %s\n"
+msgstr "���/�ɶ��x�s����:                    %s\n"
 
-#: pg_controldata.c:173
+#: pg_controldata.c:178
 msgid "64-bit integers"
 msgstr "64�줸���"
 
-#: pg_controldata.c:173
+#: pg_controldata.c:178
 msgid "floating-point numbers"
 msgstr "�B�I��"
 
-#: pg_controldata.c:174
+#: pg_controldata.c:179
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
-msgstr "�ϰ�(locale)�W�٪��̤j����:                   %u\n"
+msgstr "locale�W�٪��̤j����:                 %u\n"
 
-#: pg_controldata.c:175
+#: pg_controldata.c:180
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_controldata.c:176
+#: pg_controldata.c:181
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
+
diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index 1b049547dc30d71c753da2edee5909225809b6d9..e10229ec27df8bfc5d19e411ec7a0f3819b536be 100644
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.2 2004/06/25 09:49:36 dennis Exp $
+# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.3 2004/07/30 05:28:42 petere Exp $
 CATALOG_NAME	:= pg_ctl
-AVAIL_LANGUAGES	:= ru sv
+AVAIL_LANGUAGES	:= ru sv zh_TW
 GETTEXT_FILES	:= pg_ctl.c
 GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/pg_ctl/po/zh_TW.po b/src/bin/pg_ctl/po/zh_TW.po
new file mode 100644
index 0000000000000000000000000000000000000000..1be04b6262bcadc204882d50171a92e0d3908c58
--- /dev/null
+++ b/src/bin/pg_ctl/po/zh_TW.po
@@ -0,0 +1,455 @@
+# Traditional Chinese translation for pg_ctl.
+# 2004-07-30 Zhenbang Wei <forth@zbwei.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.5\n"
+"POT-Creation-Date: 2004-07-29 19:16-0300\n"
+"PO-Revision-Date: 2004-07-30 12:27+0800\n"
+"Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
+"Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=Big5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_ctl.c:184
+#: pg_ctl.c:200
+#: pg_ctl.c:1230
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: �O����κ�\n"
+
+#: pg_ctl.c:431
+#, c-format
+msgid "%s: Another postmaster may be running. Trying to start postmaster anyway.\n"
+msgstr "%s: �i�঳�t�@��postmaster���b����A���ձj��Ұ�postmaster�C\n"
+
+#: pg_ctl.c:449
+#, c-format
+msgid "%s: cannot read %s\n"
+msgstr "%s: �L�k�� %s\n"
+
+#: pg_ctl.c:455
+#, c-format
+msgid "%s: option file %s must have exactly 1 line\n"
+msgstr "%s: �ﶵ�� %s �u�঳�@����\n"
+
+#: pg_ctl.c:497
+#, c-format
+msgid ""
+"The program \"postmaster\" is needed by %s but was not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s �ݭn\"postmaster\"�{���A���O�b�P\"%s\"�ۦP���ؿ����䤣��C\n"
+"�ˬd�A���w�ˡC\n"
+
+#: pg_ctl.c:503
+#, c-format
+msgid ""
+"The program \"postmaster\" was found by %s but was not the same version as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s �w���{��\"postmaster\"�A���O�P \"%s\"�������šC\n"
+"���ˬd�A���w�ˡC\n"
+
+#: pg_ctl.c:514
+msgid "Unable to run the postmaster binary\n"
+msgstr "�L�k����postmaster������\n"
+
+#: pg_ctl.c:524
+#, c-format
+msgid ""
+"%s: cannot start postmaster\n"
+"Examine the log output\n"
+msgstr ""
+"%s: �L�k�Ұ�postmaster\n"
+"���ˬdlog��X\n"
+
+#: pg_ctl.c:535
+msgid "waiting for postmaster to start..."
+msgstr "����postmaster�Ұ�..."
+
+#: pg_ctl.c:540
+msgid "could not start postmaster\n"
+msgstr "�L�k�Ұ�postmaster\n"
+
+#: pg_ctl.c:542
+msgid ""
+"done\n"
+"postmaster started\n"
+msgstr ""
+"����\n"
+"postmaster�w�g�Ұ�\n"
+
+#: pg_ctl.c:545
+msgid "postmaster starting\n"
+msgstr "postmaster���b�Ұ�\n"
+
+#: pg_ctl.c:560
+#: pg_ctl.c:639
+#: pg_ctl.c:709
+#, c-format
+msgid "%s: could not find %s\n"
+msgstr "%s: �䤣�� %s\n"
+
+#: pg_ctl.c:561
+#: pg_ctl.c:710
+msgid "Is postmaster running?\n"
+msgstr "postmaster�O�_���b����H\n"
+
+#: pg_ctl.c:567
+#, c-format
+msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: �L�k����postmaster�Apostgres���b����(PID: %ld)\n"
+
+#: pg_ctl.c:575
+#: pg_ctl.c:656
+#, c-format
+msgid "stop signal failed (PID: %ld): %s\n"
+msgstr "stop�H������(PID: %ld): %s\n"
+
+#: pg_ctl.c:583
+msgid "postmaster shutting down\n"
+msgstr "postmaster���b����\n"
+
+#: pg_ctl.c:590
+#: pg_ctl.c:663
+msgid "waiting for postmaster to shut down..."
+msgstr "����postmaster����..."
+
+#: pg_ctl.c:612
+#: pg_ctl.c:687
+msgid " failed\n"
+msgstr "����\n"
+
+#: pg_ctl.c:614
+#: pg_ctl.c:689
+#, c-format
+msgid "%s: postmaster does not shut down\n"
+msgstr "%s: postmaster�L�k����\n"
+
+#: pg_ctl.c:618
+#: pg_ctl.c:694
+msgid "done\n"
+msgstr "����\n"
+
+#: pg_ctl.c:620
+#: pg_ctl.c:696
+msgid "postmaster stopped\n"
+msgstr "postmaster�������\n"
+
+#: pg_ctl.c:640
+msgid ""
+"Is postmaster running?\n"
+"starting postmaster anyway\n"
+msgstr ""
+"postmaster�O�_���b����H\n"
+"�j��Ұ�postmaster\n"
+
+#: pg_ctl.c:647
+#, c-format
+msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: �L�k���s�Ұ�postmaster�Apostgres���b����(PID: %ld)\n"
+
+#: pg_ctl.c:650
+#: pg_ctl.c:719
+msgid "Please terminate postgres and try again.\n"
+msgstr "�е���postgres�M��A�դ@���C\n"
+
+#: pg_ctl.c:716
+#, c-format
+msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: �L�k���s���Jpostmaster�A postgres���b����(PID: %ld)\n"
+
+#: pg_ctl.c:725
+#, c-format
+msgid "reload signal failed (PID: %ld): %s\n"
+msgstr "reload�H������(PID: %ld): %s\n"
+
+#: pg_ctl.c:731
+msgid "postmaster signaled\n"
+msgstr "�w�q��postmaster\n"
+
+#: pg_ctl.c:746
+#, c-format
+msgid "%s: postmaster or postgres not running\n"
+msgstr "%s: postmaster��postgres�|������\n"
+
+#: pg_ctl.c:752
+#, c-format
+msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
+msgstr "%s: �@�ӿW�߫��\"postgres\"���b����(PID: %ld)\n"
+
+#: pg_ctl.c:758
+#, c-format
+msgid "%s: postmaster is running (PID: %ld)\n"
+msgstr "%s: postmaster���b����(PID: %ld)\n"
+
+#: pg_ctl.c:774
+#, c-format
+msgid "signal %d failed (PID: %ld): %s\n"
+msgstr "�H�� %d ����(PID: %ld): %s\n"
+
+#: pg_ctl.c:801
+msgid "Unable to find exe"
+msgstr "�䤣�������"
+
+#: pg_ctl.c:844
+#: pg_ctl.c:875
+msgid "Unable to open service manager\n"
+msgstr "�L�k�}�ҪA�Ⱥ޲z��\n"
+
+#: pg_ctl.c:850
+#, c-format
+msgid "Service \"%s\" already registered\n"
+msgstr "�A��\"%s\"�w�g�Q���U\n"
+
+#: pg_ctl.c:861
+#, c-format
+msgid "Unable to register service \"%s\" [%d]\n"
+msgstr "�L�k���U�A��\"%s\" [%d]\n"
+
+#: pg_ctl.c:881
+#, c-format
+msgid "Service \"%s\" not registered\n"
+msgstr "�A��\"%s\"���Q���U\n"
+
+#: pg_ctl.c:888
+#, c-format
+msgid "Unable to open service \"%s\" [%d]\n"
+msgstr "�L�k�}�ҪA��\"%s\" [%d]\n"
+
+#: pg_ctl.c:894
+#, c-format
+msgid "Unable to unregister service \"%s\" [%d]\n"
+msgstr "�L�k�����A��\"%s\" [%d]\n"
+
+#: pg_ctl.c:1012
+#, c-format
+msgid ""
+"\n"
+"Try \"%s --help\" for more information.\n"
+msgstr ""
+"\n"
+"����\"%s --help\"�H��ܧ�h��T�C\n"
+
+#: pg_ctl.c:1020
+#, c-format
+msgid ""
+"%s is a utility to start, stop, restart, reload configuration files,\n"
+"report the status of a PostgreSQL server, or kill a PostgreSQL process\n"
+"\n"
+msgstr ""
+"%s �i�H�ΨӱҰʡB����B���s�ҰʡB���s���J�]�w�ɡB\n"
+"���iPostgreSQL���A�����A�A�άO����PostgreSQL��{\n"
+"\n"
+
+#: pg_ctl.c:1022
+msgid "Usage:\n"
+msgstr "�ϥΤ�k:\n"
+
+#: pg_ctl.c:1023
+#, c-format
+msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
+msgstr "  %s start   [-w] [-D ��ƥؿ�] [-s] [-l �ɦW] [-o \"�ﶵ\"]\n"
+
+#: pg_ctl.c:1024
+#, c-format
+msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
+msgstr "  %s stop    [-W] [-D ��ƥؿ�] [-s] [-m �����Ҧ�]\n"
+
+#: pg_ctl.c:1025
+#, c-format
+msgid "  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
+msgstr "  %s restart [-w] [-D ��ƥؿ�] [-s] [-m �����Ҧ�] [-o \"�ﶵ\"]\n"
+
+#: pg_ctl.c:1026
+#, c-format
+msgid "  %s reload  [-D DATADIR] [-s]\n"
+msgstr "  %s reload  [-D ��ƥؿ�] [-s]\n"
+
+#: pg_ctl.c:1027
+#, c-format
+msgid "  %s status  [-D DATADIR]\n"
+msgstr "  %s status  [-D ��ƥؿ�]\n"
+
+#: pg_ctl.c:1028
+#, c-format
+msgid "  %s kill    SIGNALNAME PROCESSID\n"
+msgstr "  %s kill    �H���W�� ��{ID\n"
+
+#: pg_ctl.c:1030
+#, c-format
+msgid "  %s register   [-N servicename] [-U username] [-P password] [-D DATADIR] [-o \"OPTIONS\"]\n"
+msgstr "  %s register   [-N �A�ȦW��] [-U �ϥΪ�] [-P �K�X] [-D ��ƥؿ�] [-o \"�ﶵ\"]\n"
+
+#: pg_ctl.c:1031
+#, c-format
+msgid "  %s unregister [-N servicename]\n"
+msgstr "  %s unregister [-N �A�ȦW��]\n"
+
+#: pg_ctl.c:1033
+msgid "Common options:\n"
+msgstr "�@��ﶵ:\n"
+
+#: pg_ctl.c:1034
+msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
+msgstr "  -D, --pgdata ��ƥؿ�  �s���Ʈw���ؿ�\n"
+
+#: pg_ctl.c:1035
+msgid "  -s, --silent only print errors, no informational messages\n"
+msgstr "  -s, --silent �u��ܿ��~�A����ܨ䥦�T��\n"
+
+#: pg_ctl.c:1037
+msgid "  -N       service name with which to register PostgreSQL server\n"
+msgstr "  -N       �Ψӵ��UPostgreSQL���A�����A�ȦW��\n"
+
+#: pg_ctl.c:1038
+msgid "  -P       password of account to register PostgreSQL server\n"
+msgstr "  -P       �Ψӵ��UPostgreSQL���A�����K�X\n"
+
+#: pg_ctl.c:1039
+msgid "  -U       user name of account to register PostgreSQL server\n"
+msgstr "  -U       �Ψӵ��UPostgreSQL���A�����b��\n"
+
+#: pg_ctl.c:1041
+msgid "  -w           wait until operation completes\n"
+msgstr "  -w           ���ݾާ@����\n"
+
+#: pg_ctl.c:1042
+msgid "  -W           do not wait until operation completes\n"
+msgstr "  -W           �����ݾާ@����\n"
+
+#: pg_ctl.c:1043
+msgid "  --help       show this help, then exit\n"
+msgstr "  --help       ��ܳo�������M�ᵲ��\n"
+
+#: pg_ctl.c:1044
+msgid "  --version    output version information, then exit\n"
+msgstr "  --version    ��ܪ�����T�M�ᵲ��\n"
+
+#: pg_ctl.c:1045
+msgid ""
+"(The default is to wait for shutdown, but not for start or restart.)\n"
+"\n"
+msgstr ""
+"(�w�]�O�����ɦӫD�Ұʩέ��s�Ұʮɵ��ݡC)\n"
+"\n"
+
+#: pg_ctl.c:1046
+msgid ""
+"If the -D option is omitted, the environment variable PGDATA is used.\n"
+"\n"
+msgstr ""
+"�ﶵ -D �w�g�����A��������ܼ�PGDATA�C\n"
+"\n"
+
+#: pg_ctl.c:1047
+msgid "Options for start or restart:\n"
+msgstr "�Ұʩέ��s�Ұʥi�οﶵ:\n"
+
+#: pg_ctl.c:1048
+msgid ""
+"  -l, --log FILENAME      write (or append) server log to FILENAME.  The\n"
+"                          use of this option is highly recommended.\n"
+msgstr "  -l, --log �ɦW          �N���A��log�g�J�ɮסA��ij�ϥΡC\n"
+
+#: pg_ctl.c:1050
+msgid ""
+"  -o OPTIONS              command line options to pass to the postmaster\n"
+"                          (PostgreSQL server executable)\n"
+msgstr "  -o �ﶵ                 �ǵ�postmaster(PostgreSQL���A��������)���R�O�C�ﶵ\n"
+
+#: pg_ctl.c:1052
+msgid ""
+"  -p PATH-TO-POSTMASTER   normally not necessary\n"
+"\n"
+msgstr ""
+"  -p postmaster�����|     �q�`���ݭn\n"
+"\n"
+
+#: pg_ctl.c:1053
+msgid "Options for stop or restart:\n"
+msgstr "����έ��s�Ұʥi�οﶵ:\n"
+
+#: pg_ctl.c:1054
+msgid ""
+"  -m SHUTDOWN-MODE   may be 'smart', 'fast', or 'immediate'\n"
+"\n"
+msgstr ""
+"  -m �����Ҧ�        �i�H�O'smart'�B'fast'��'immediate'\n"
+"\n"
+
+#: pg_ctl.c:1055
+msgid "Allowed signal names for kill:\n"
+msgstr "kill�i�H�ϥΪ��H���W��:\n"
+
+#: pg_ctl.c:1056
+msgid ""
+"  HUP INT QUIT ABRT TERM USR1 USR2\n"
+"\n"
+msgstr ""
+
+#: pg_ctl.c:1057
+msgid "Shutdown modes are:\n"
+msgstr "�����Ҧ�:\n"
+
+#: pg_ctl.c:1058
+msgid "  smart       quit after all clients have disconnected\n"
+msgstr "  smart       �b�Ҧ��Τ���_�u������\n"
+
+#: pg_ctl.c:1059
+msgid "  fast        quit directly, with proper shutdown\n"
+msgstr "  fast        �������`����\n"
+
+#: pg_ctl.c:1060
+msgid ""
+"  immediate   quit without complete shutdown; will lead to recovery on restart\n"
+"\n"
+msgstr ""
+"  immediate   �ߧY�����A�|�ɭP�U���Ұʮɻݭn�_��{��\n"
+"\n"
+
+#: pg_ctl.c:1061
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "�^�����~�� <pgsql-bugs@postgresql.org>�C\n"
+
+#: pg_ctl.c:1086
+#, c-format
+msgid "%s: invalid shutdown mode %s\n"
+msgstr "%s: �L�Ī������Ҧ� %s\n"
+
+#: pg_ctl.c:1119
+#, c-format
+msgid "%s: invalid signal \"%s\"\n"
+msgstr "%s: �L���H��\"%s\"\n"
+
+#: pg_ctl.c:1246
+#, c-format
+msgid "%s: invalid option %s\n"
+msgstr "%s: �L�Ī��ﶵ %s\n"
+
+#: pg_ctl.c:1257
+#, c-format
+msgid "%s: extra operation mode %s\n"
+msgstr "%s: �h�l���ާ@�Ҧ� %s\n"
+
+#: pg_ctl.c:1276
+#, c-format
+msgid "%s: invalid kill syntax\n"
+msgstr "%s: �L��kill�y�k\n"
+
+#: pg_ctl.c:1294
+#, c-format
+msgid "%s: invalid operation mode %s\n"
+msgstr "%s: �L�Ī��ާ@�Ҧ� %s\n"
+
+#: pg_ctl.c:1304
+#, c-format
+msgid "%s: no operation specified\n"
+msgstr "%s: �����w�ާ@�覡\n"
+
+#: pg_ctl.c:1320
+#, c-format
+msgid "%s: no database directory specified and environment variable PGDATA unset\n"
+msgstr "%s: �����w��ƥؿ��M�]�w�����ܼ�PGDATA\n"
diff --git a/src/bin/pg_resetxlog/nls.mk b/src/bin/pg_resetxlog/nls.mk
index d3a13a6fa235eff120eb6bf79a38705fc8f6da79..202365d459621568ff84d9d9ec1512ce147465a1 100644
--- a/src/bin/pg_resetxlog/nls.mk
+++ b/src/bin/pg_resetxlog/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_resetxlog/nls.mk,v 1.12 2004/04/15 08:15:08 petere Exp $
+# $PostgreSQL: pgsql/src/bin/pg_resetxlog/nls.mk,v 1.13 2004/07/30 05:28:47 petere Exp $
 CATALOG_NAME	:= pg_resetxlog
-AVAIL_LANGUAGES	:= cs de es fr hu it nb pt_BR ru sl sv zh_CN
+AVAIL_LANGUAGES	:= cs de es fr hu it nb pt_BR ru sl sv zh_CN zh_TW
 GETTEXT_FILES	:= pg_resetxlog.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_resetxlog/po/zh_TW.po b/src/bin/pg_resetxlog/po/zh_TW.po
new file mode 100644
index 0000000000000000000000000000000000000000..e0932bea22cd83ecdefaff90067c9a665183964e
--- /dev/null
+++ b/src/bin/pg_resetxlog/po/zh_TW.po
@@ -0,0 +1,338 @@
+# Traditional Chinese translation for pg_resetxlog.
+# 2004-07-30 Zhenbang Wei <forth@zbwei.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.5\n"
+"POT-Creation-Date: 2004-07-29 19:16-0300\n"
+"PO-Revision-Date: 2004-07-30 12:56+0800\n"
+"Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
+"Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=Big5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_resetxlog.c:120
+#, c-format
+msgid "%s: invalid argument for option -x\n"
+msgstr "%s: �ﶵ -x ���ѼƵL��\n"
+
+#: pg_resetxlog.c:121
+#: pg_resetxlog.c:136
+#: pg_resetxlog.c:151
+#: pg_resetxlog.c:158
+#: pg_resetxlog.c:164
+#: pg_resetxlog.c:172
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "����\"%s --help\"�H��ܧ�h��T�C\n"
+
+#: pg_resetxlog.c:126
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: ��� ID (-x) �����O 0\n"
+
+#: pg_resetxlog.c:135
+#, c-format
+msgid "%s: invalid argument for option -o\n"
+msgstr "%s: �ﶵ -o ���ѼƵL��\n"
+
+#: pg_resetxlog.c:141
+#, c-format
+msgid "%s: OID (-o) must not be 0\n"
+msgstr "%s: OID (-o) �����O 0\n"
+
+#: pg_resetxlog.c:150
+#: pg_resetxlog.c:157
+#, c-format
+msgid "%s: invalid argument for option -l\n"
+msgstr "%s: �ﶵ -l ���ѼƵL��\n"
+
+#: pg_resetxlog.c:171
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: �����w��ƥؿ�\n"
+
+#: pg_resetxlog.c:191
+#: pg_resetxlog.c:287
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: �L�k�}���ɮ�\"%s\"�HŪ��: %s\n"
+
+#: pg_resetxlog.c:197
+#, c-format
+msgid ""
+"%s: lock file \"%s\" exists\n"
+"Is a server running?  If not, delete the lock file and try again.\n"
+msgstr ""
+"%s: ��w��\"%s\"�w�s�b\n"
+"���A���O�_���b����H�p�G���O�A�R����w�ɫ�A�դ@���C\n"
+
+#: pg_resetxlog.c:236
+msgid ""
+"\n"
+"If these values seem acceptable, use -f to force reset.\n"
+msgstr ""
+"\n"
+"�p�G�i�H�����o�ǭȡA�Х� -f �j��]�C\n"
+
+#: pg_resetxlog.c:248
+msgid ""
+"The database server was not shut down cleanly.\n"
+"Resetting the transaction log may cause data to be lost.\n"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"��Ʈw���A���S�����`�����A���]�����x�i��ɭP\n"
+"��ƿ򥢡A�p�G�A���n����A�Х� -f �j��]�C\n"
+
+#: pg_resetxlog.c:261
+msgid "Transaction log reset\n"
+msgstr "���]�����x\n"
+
+#: pg_resetxlog.c:290
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, execute\n"
+"  touch %s\n"
+"and try again.\n"
+msgstr ""
+"�p�G�A�T�w��ƥؿ������|���T�A�а���\n"
+"  touch %s\n"
+"�M��A�դ@���C\n"
+
+#: pg_resetxlog.c:303
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: �L�kŪ���ɮ�\"%s\": %s\n"
+
+#: pg_resetxlog.c:326
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr "%s: pg_control��CRC���~�A�~�����|���M�I\n"
+
+#: pg_resetxlog.c:335
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr "%s: pg_control�i��l�a�������~�A�N������\n"
+
+#: pg_resetxlog.c:399
+#, c-format
+msgid "%s: invalid LC_COLLATE setting\n"
+msgstr "%s: �L��LC_COLLATE�]�w\n"
+
+#: pg_resetxlog.c:406
+#, c-format
+msgid "%s: invalid LC_CTYPE setting\n"
+msgstr "%s: �L��LC_CTYPE�]�w\n"
+
+#: pg_resetxlog.c:430
+msgid ""
+"Guessed pg_control values:\n"
+"\n"
+msgstr ""
+"�q����pg_control��:\n"
+"\n"
+
+#: pg_resetxlog.c:432
+msgid ""
+"pg_control values:\n"
+"\n"
+msgstr ""
+"pg_control��:\n"
+"\n"
+
+#: pg_resetxlog.c:441
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "pg_control�������X:                   %u\n"
+
+#: pg_resetxlog.c:442
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "catalog�������X:                      %u\n"
+
+#: pg_resetxlog.c:443
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "��Ʈw�t���ѧO�W��:                   %s\n"
+
+#: pg_resetxlog.c:444
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "�ثe����x��ID:                       %u\n"
+
+#: pg_resetxlog.c:445
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "�U�@�Ӥ�x�ɮװϬq:                   %u\n"
+
+#: pg_resetxlog.c:446
+#, c-format
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr "�̷s���ˬd�ITimeLineID:               %u\n"
+
+#: pg_resetxlog.c:447
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "�̷s���ˬd�INextXID:                  %u\n"
+
+#: pg_resetxlog.c:448
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "�̷s���ˬd�INextOID:                  %u\n"
+
+#: pg_resetxlog.c:449
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "��Ʈw�϶��j�p:                       %u\n"
+
+#: pg_resetxlog.c:450
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "large relation�C�ӰϬq���϶���:       %u\n"
+
+#: pg_resetxlog.c:451
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "�ѧO�r���̤j����:                     %u\n"
+
+#: pg_resetxlog.c:452
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "�禡�Ѽƪ��̤j�Ӽ�:                   %u\n"
+
+#: pg_resetxlog.c:453
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "���/�ɶ��x�s����:                    %s\n"
+
+#: pg_resetxlog.c:454
+msgid "64-bit integers"
+msgstr "64�줸���"
+
+#: pg_resetxlog.c:454
+msgid "floating-point numbers"
+msgstr "�B�I��"
+
+#: pg_resetxlog.c:455
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "locale�W�٪��̤j����:                 %u\n"
+
+#: pg_resetxlog.c:456
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+
+#: pg_resetxlog.c:457
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
+
+#: pg_resetxlog.c:518
+#, c-format
+msgid "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
+msgstr "%s: �������~ -- sizeof(ControlFileData)�Ӥj ... �Эץ�xlog.c\n"
+
+#: pg_resetxlog.c:531
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: �L�k�إ�pg_control��: %s\n"
+
+#: pg_resetxlog.c:542
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%s: �L�k�g�Jpg_control��: %s\n"
+
+#: pg_resetxlog.c:549
+#: pg_resetxlog.c:704
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: fsync�o�Ϳ��~: %s\n"
+
+#: pg_resetxlog.c:570
+#, c-format
+msgid "%s: could not open directory \"%s\": %s\n"
+msgstr "%s: �L�k�}�ҥؿ�\"%s\": %s\n"
+
+#: pg_resetxlog.c:584
+#, c-format
+msgid "%s: could not delete file \"%s\": %s\n"
+msgstr "%s: �L�k�R���ɮ�\"%s\": %s\n"
+
+#: pg_resetxlog.c:600
+#, c-format
+msgid "%s: could not read from directory \"%s\": %s\n"
+msgstr "%s: �L�kŪ���ؿ�\"%s\": %s\n"
+
+#: pg_resetxlog.c:671
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: �L�k�}���ɮ�\"%s\": %s\n"
+
+#: pg_resetxlog.c:682
+#: pg_resetxlog.c:696
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: �L�k�g�J�ɮ�\"%s\": %s\n"
+
+#: pg_resetxlog.c:715
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr ""
+"%s ���]PostgreSQL�����x�C\n"
+"\n"
+
+#: pg_resetxlog.c:716
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION]... DATADIR\n"
+"\n"
+msgstr ""
+"�ϥΤ�k:\n"
+"  %s [�ﶵ]... ��ƥؿ�\n"
+"\n"
+
+#: pg_resetxlog.c:717
+msgid "Options:\n"
+msgstr "�ﶵ:\n"
+
+#: pg_resetxlog.c:718
+msgid "  -f              force update to be done\n"
+msgstr "  -f              �j������s\n"
+
+#: pg_resetxlog.c:719
+msgid "  -l FILEID,SEG   force minimum WAL starting location for new transaction log\n"
+msgstr "  -l FILEID,SEG   �j��s�����x���̤pWAL�}�l��m\n"
+
+#: pg_resetxlog.c:720
+msgid "  -n              no update, just show extracted control values (for testing)\n"
+msgstr "  -n              �������s�A�u��ܨ��o�������T(�H�Ѵ���)\n"
+
+#: pg_resetxlog.c:721
+msgid "  -o OID          set next OID\n"
+msgstr "  -o OID          �]�w�U�@��OID\n"
+
+#: pg_resetxlog.c:722
+msgid "  -x XID          set next transaction ID\n"
+msgstr "  -x XID          �]�w�U�@�ӥ��ID\n"
+
+#: pg_resetxlog.c:723
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          ��ܳo�������M�ᵲ��\n"
+
+#: pg_resetxlog.c:724
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       ��ܪ�����T�M�ᵲ��\n"
+
+#: pg_resetxlog.c:725
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"�^�����~�� <pgsql-bugs@postgresql.org>�C\n"
+