diff --git a/src/backend/po/zh_TW.po b/src/backend/po/zh_TW.po
index 5466c984ee2ca891dbd90390b16813599baa23a6..e87b9c89d1e4544b7b6821bab3cc34c69698888f 100644
--- a/src/backend/po/zh_TW.po
+++ b/src/backend/po/zh_TW.po
@@ -2,12 +2,11 @@
 # Translated and modified from Simplified Chinese translation.
 # Zhenbang Wei <forth@zbwei.net>, 2001.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.2\n"
 "POT-Creation-Date: 2001-10-01 09:32+0800\n"
-"PO-Revision-Date: 2001-10-05 01:00:00+0800\n"
+"PO-Revision-Date: 2001-10-24 01:00:00+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -61,10 +60,10 @@ msgid ""
 "more information on how to properly start the server.\n"
 "\n"
 msgstr ""
-"�����\ \"root\" ���� PostgreSQL ���A���C\n"
+"�����\\ \"root\" ���� PostgreSQL ���A���C\n"
 "\n"
 "���A�������H�D�S�v�ϥΪ̨����ҰʥH�קK\n"
-"�i�઺�t�Φw�����D�A�аѾ\���H��o\n"
+"�i�઺�t�Φw�����D�A�аѾ\\���H��o\n"
 "�����p�󥿽T�Ұʦ��A������T�C\n"
 "\n"
 
@@ -111,7 +110,7 @@ msgid ""
 "The number of buffers (-B) must be at least twice the number of allowed "
 "connections (-N) and at least 16."
 msgstr ""
-"�w�İϪ��ƶq (-B) �����O���\�s���� (-N)"
+"�w�İϪ��ƶq (-B) �����O���\\�s���� (-N)"
 "���⭿�åB�ܤ֬� 16."
 
 #: ../postmaster/postmaster.c:587
@@ -204,7 +203,7 @@ msgstr "  -l              
 #: ../postmaster/postmaster.c:787
 #, c-format
 msgid "  -N MAX-CONNECT  maximum number of allowed connections (default %d)\n"
-msgstr "  -N �̤j�s����     ���\���̤j�s���ƥ� (�w�]�O %d)\n"
+msgstr "  -N �̤j�s����     ���\\���̤j�s���ƥ� (�w�]�O %d)\n"
 
 #: ../postmaster/postmaster.c:789
 msgid "  -o OPTIONS      pass 'OPTIONS' to each backend server\n"
@@ -249,10 +248,10 @@ msgid ""
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"�о\Ū�����o����ɴ��t�m�]�w������C���H�Φp\n"
+"�о\\Ū�����o����ɴ��t�m�]�w������C���H�Φp\n"
 "��b�R�O�C�Ϊ̦b�t�m���̳]�w���̪��ԲӰT���C\n"
 "\n"
-"�ЦV <pgsql-bugs@postgresql.org> ���i���ΡC\n"
+"�ЦV <pgsql-bugs@postgresql.org> �^�����~�C\n"
 
 #: ../postmaster/postmaster.c:2216
 #, c-format
diff --git a/src/bin/pg_dump/zh_TW.po b/src/bin/pg_dump/zh_TW.po
index ceab181137062ede5d5f66e52f53dd3441053fb8..4a3ffe07bb24377ba270fe132cbbd5d21265059a 100644
--- a/src/bin/pg_dump/zh_TW.po
+++ b/src/bin/pg_dump/zh_TW.po
@@ -2,12 +2,11 @@
 # Translated and modified from Simplified Chinese translation.
 # Zhenbang Wei <forth@zbwei.net>, 2001.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.2\n"
 "POT-Creation-Date: 2001-10-01 10:02+0800\n"
-"PO-Revision-Date: 2001-10-05 01:00:00+0800\n"
+"PO-Revision-Date: 2001-10-24 01:00:00+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -78,17 +77,17 @@ msgstr ""
 "  -a, --data-only          �u��X��ơA���]�A�j��\n"
 "  -b, --blobs              �b��X���]�t���O�� BLOB �����\n"
 "  -c, --clean              �b�إߤ��e�M�z(�R��)�j��\n"
-"  -C, --create             ��X�إ߸�Ʈw���R�O\n"
-"  -d, --inserts            �N��ƥH INSERT ���Φ���X�A�ӫD COPY �R�O���Φ�\n"
+"  -C, --create             ��X�إ߸�Ʈw�����O\n"
+"  -d, --inserts            �N��ƥH INSERT ���Φ���X�A�ӫD COPY ���O���Φ�\n"
 "  -D, --column-inserts     �N��ƥH�a�����W�٪� INSERT �Φ���X\n"
 "  -f, --file=�ɮצW��      ��X�ɮצW��\n"
 "  -F, --format {c|t|p}     ��X�ɮ׮榡(�۩w�Btar�B�¤�r)\n"
 "  -h, --host=�D���W��      ��Ʈw���A���D���W��\n"
 "  -i, --ignore-version     �Y�Ϧ��A�������M pg_dump �������ŦX�]�~�����\n"
 "  -n, --no-quotes          ����ХܲŸ��P�򪺵��j�����޸�\n"
-"  -N, --quotes             ���\�ХܲŸ��P�򪺵��j�����޸�\n"
+"  -N, --quotes             ���\\�ХܲŸ��P�򪺵��j�����޸�\n"
 "  -o, --oids               �b��X���]�A oid\n"
-"  -O, --no-owner           �b�¤�r�榡�����n�]�A \\connect �R�O\n"
+"  -O, --no-owner           �b�¤�r�榡�����n�]�A \\connect ���O\n"
 "  -p, --port=��          ��Ʈw���A����\n"
 "  -R, --no-reconnect       �b�¤�r�榡�������Ҧ��P��Ʈw�����s�s��\n"
 "  -s, --schema-only        �u��X��ƪ��j���A����X���\n"
@@ -99,8 +98,8 @@ msgstr ""
 "  -W, --password           �j��K�X�߰� (���Ӧ۰ʸ߰�)\n"
 "  -x, --no-privileges      ����X�v�� (grant/revoke)\n"
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
-"                           ��X SET SESSION AUTHORIZATION �R�O�Ӥ��O\n"
-"                           \\connect �R�O\n"
+"                           ��X SET SESSION AUTHORIZATION ���O�Ӥ��O\n"
+"                           \\connect ���O\n"
 "  -Z, --compress {0-9}     ���Y�榡�����Y����\n"
 
 #: pg_dump.c:177
@@ -141,17 +140,17 @@ msgstr ""
 "  -a                       �u��X��ơA���]�A�j��\n"
 "  -b                       �b��X���]�t���O�� BLOB �����\n"
 "  -c                       �b�إߤ��e�M�z(�R��)�j��\n"
-"  -C                       �b��X���]�A�إ߸�Ʈw���R�O\n"
-"  -d                       �N��ƥH INSERT �Φ���X�A�ӫD COPY �R�O\n"
-"  -D                       �N��ƥH�a���W�٪� INSERT �R�O�Φ���X\n"
+"  -C                       �b��X���]�A�إ߸�Ʈw�����O\n"
+"  -d                       �N��ƥH INSERT �Φ���X�A�ӫD COPY ���O\n"
+"  -D                       �N��ƥH�a���W�٪� INSERT ���O�Φ���X\n"
 "  -f �ɮצW��              ��X�ɮצW��\n"
 "  -F {c|t|p}               ��X�ɮ׮榡(�۩w�Btar�B�¤�r)\n"
 "  -h �D���W��              ��Ʈw���A���D���W��\n"
 "  -i                       �Y�Ϧ��A�������M pg_dump �������ŦX�]�~�����\n"
 "  -n                       ����b�j�h�ƼХܲŸ��P�򪺤޸�\n"
-"  -N                       ���\�b�j�h�ƼХܲŸ��P�򪺤޸�\n"
+"  -N                       ���\\�b�j�h�ƼХܲŸ��P�򪺤޸�\n"
 "  -o                       �b��X���]�A oid\n"
-"  -O                       �b�¤�r�榡������X \\connect �R�O\n"
+"  -O                       �b�¤�r�榡������X \\connect ���O\n"
 "  -p ��                  ��Ʈw���A����\n"
 "  -R                       �b�¤�r�榡�������Ҧ��P��Ʈw�����s�s��\n"
 "  -s                       �u��X�j���A���]�A���\n"
@@ -162,8 +161,8 @@ msgstr ""
 "  -W                       �j��K�X�߰� (���Ӧ۰ʸ߰�)\n"
 "  -x                       ����X�v�� (grant/revoke)\n"
 "  -X use-set-session-authorization\n"
-"                           ��X SET SESSION AUTHORIZATION �R�O, �Ӥ��O\n"
-"                           \\connect �R�O\n"
+"                           ��X SET SESSION AUTHORIZATION ���O, �Ӥ��O\n"
+"                           \\connect ���O\n"
 "  -Z {0-9}                 ���Y�榡�����Y����\n"
 
 #: pg_dump.c:210
@@ -206,7 +205,7 @@ msgid ""
 "%s: too many command line options (first is '%s')\n"
 "Try '%s --help' for more information.\n"
 msgstr ""
-"%s: �R�O�C�ѼƤӦh (�Ĥ@�ӬO '%s')\n"
+"%s: ���O�ѼƹL�h (�Ĥ@�ӬO '%s')\n"
 "��J '%s --help' ��ܧ�h�T���C\n"
 
 #: pg_backup_archiver.c:94
@@ -288,7 +287,7 @@ msgid ""
 msgstr ""
 "  -a, --data-only          �u�٭��ơA���]�A�j��\n"
 "  -c, --clean              �b�إߤ��e�M�z(�R��)�j��\n"
-"  -C, --create             �o�X�إ߸�Ʈw���R�O\n"
+"  -C, --create             �o�X�إ߸�Ʈw�����O\n"
 "  -d, --dbname=�W��        ���w��Ʈw�W��\n"
 "  -f, --file=�ɮצW��      TOC ��X�ɮצW��(�Ѩ� -l)\n"
 "  -F, --format={c|t}       ���w�ƥ��ɮ׮榡\n"
@@ -312,7 +311,7 @@ msgstr ""
 "  -W, --password           �j��K�X�߰� (���Ӧ۰ʸ߰�)\n"
 "  -x, --no-privileges      �����s���v��(grant/revoke)���٭�\n"
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
-"                           ���i��� SET SESSION AUTHORIZATION �R�O�Ӥ��O\n"
+"                           ���i��� SET SESSION AUTHORIZATION ���O�Ӥ��O\n"
 "                           ���s�s��\n"
 
 #: pg_restore.c:420
@@ -353,7 +352,7 @@ msgid ""
 msgstr ""
 "  -a                       �u�٭��ơA���٭�j��\n"
 "  -c                       �إߤ��e�M�z(�R��)�j��\n"
-"  -C                       �o�X�إ߸�Ʈw���R�O\n"
+"  -C                       �o�X�إ߸�Ʈw�����O\n"
 "  -d �W��                  ���w��Ʈw�W��\n"
 "  -f �ɮצW��              TOC ��X�ɮצW�� (�Ѩ� -l)\n"
 "  -F {c|t}                 ���w�ƥ��ɮ׮榡\n"
@@ -377,7 +376,7 @@ msgstr ""
 "  -W                       �j��K�X�߰� (���Ӧ۰ʸ߰�)\n"
 "  -x                       �����s���v�� (grant/reovke) ���٭�\n"
 "  -X use-set-session-authorization\n"
-"                           ���i��ϥ� SET SESSION AUTHORIZATION �R�O, �Ӥ��O\n"
+"                           ���i��ϥ� SET SESSION AUTHORIZATION ���O, �Ӥ��O\n"
 "                           ���s�s��\n"
 
 #: pg_restore.c:453
@@ -386,5 +385,5 @@ msgstr "
 
 #: pg_restore.c:454
 msgid "Report bugs to <pgsql-bugs@postgresql.org>."
-msgstr "�V <pgsql-bugs@postgresql.org> ���i���ΡC"
+msgstr "�V <pgsql-bugs@postgresql.org> �^�����~�C"
 
diff --git a/src/bin/psql/zh_TW.po b/src/bin/psql/zh_TW.po
index 83badff46633729baf6ddc41af34825513708885..ac4d723ef7361d49722258fc2a8c16879193d39b 100644
--- a/src/bin/psql/zh_TW.po
+++ b/src/bin/psql/zh_TW.po
@@ -2,12 +2,11 @@
 # Translated and modified from Simplified Chinese translation.
 # Zhenbang Wei <forth@zbwei.net>, 2001.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.2\n"
 "POT-Creation-Date: 2001-10-01 10:02+0800\n"
-"PO-Revision-Date: 2001-10-05 01:00:00+0800\n"
+"PO-Revision-Date: 2001-10-24 01:00:00+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -21,36 +20,36 @@ msgstr "ĵ
 #: command.c:159
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
-msgstr "�L���R�O \\%s. �� \\? ���o�����C\n"
+msgstr "�L�����O \\%s. �� \\? ���o�����C\n"
 
 #: command.c:161
 #, c-format
 msgid "invalid command \\%s\n"
-msgstr "�L���R�O \\%s\n"
+msgstr "�L�����O \\%s\n"
 
 #: command.c:278
 #, c-format
 msgid "could not get home directory: %s\n"
-msgstr "�L�k��o home �ؿ�: %s\n"
+msgstr "�L�k���o home �ؿ�: %s\n"
 
 #: command.c:292
 #, c-format
 msgid "\\%s: could not change directory to '%s': %s\n"
-msgstr "\\%s: ������ܨ� '%s' �ؿ�: %s\n"
+msgstr "\\%s: ��������� '%s' �ؿ�: %s\n"
 
 #: command.c:380 command.c:726
 msgid "no query buffer\n"
-msgstr "�L�d�߽w�İ�\n"
+msgstr "�S���d�߽w�İ�\n"
 
 #: command.c:436
 #, c-format
 msgid "%s: invalid encoding name\n"
-msgstr "%s: �L�Ľs�X�W��\n"
+msgstr "%s: �L���s�X�W��\n"
 
 #: command.c:445
 #, c-format
 msgid "\\%s: multibyte support is not enabled\n"
-msgstr "\\%s: �h�줸�զr���䴩�����}\n"
+msgstr "\\%s: ���Ұʦh�줸�զr���䴩\n"
 
 #: command.c:499 command.c:530 command.c:541 command.c:555 command.c:597
 #: command.c:706 command.c:735
@@ -64,7 +63,7 @@ msgstr "
 
 #: command.c:616
 msgid "Query buffer reset (cleared)."
-msgstr "���m(�M��)�d�߽w�İ�."
+msgstr "���m(�M��)�d�߽w�İϡC"
 
 #: command.c:627
 #, c-format
@@ -142,11 +141,11 @@ msgstr "
 #: command.c:1486
 #, c-format
 msgid "could not open temporary file %s: %s\n"
-msgstr "�L�k�}���{���ɮ� %s: %s\n"
+msgstr "�L�k�}���{���ɮ� %s: %s\n"
 
 #: command.c:1670
 msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
-msgstr "\\pset: ���\���榡�O unaligned�Baligned�Bhtml�Blatex\n"
+msgstr "\\pset: ���\\���榡�O unaligned�Baligned�Bhtml�Blatex\n"
 
 #: command.c:1675
 #, c-format
@@ -230,7 +229,7 @@ msgstr "
 #: command.c:1816
 #, c-format
 msgid "\\pset: unknown option: %s\n"
-msgstr "\\pset: �����ﶵ: %s\n"
+msgstr "\\pset: �����ﶵ: %s\n"
 
 #: command.c:1859
 msgid "\\!: failed\n"
@@ -259,7 +258,7 @@ msgstr "
 
 #: common.c:355 common.c:525
 msgid "Succeeded.\n"
-msgstr "���\�C\n"
+msgstr "���\\�C\n"
 
 #: common.c:393
 #, c-format
@@ -287,7 +286,7 @@ msgstr ""
 #: common.c:531
 #, c-format
 msgid "Asynchronous NOTIFY '%s' from backend with pid %d received.\n"
-msgstr "�����{�s���� %d ����ݩҶǰe���D�P�B NOTIFY(�q��) '%s'�C\n"
+msgstr "����D�P�B NOTIFY '%s'�A�o�O�Ѧ�{�s���� %d ����ݩҶǰe���C\n"
 
 #: copy.c:81
 msgid "\\copy: arguments required\n"
@@ -319,7 +318,7 @@ msgstr "
 
 #: help.c:79
 msgid "This is psql, the PostgreSQL interactive terminal.\n"
-msgstr "�o�O psql�APostgreSQL �����ʱ���O�C\n"
+msgstr "�o�O psql�APostgreSQL ����r�Ҧ������C\n"
 
 #: help.c:80
 msgid "Usage:"
@@ -335,32 +334,32 @@ msgstr "
 
 #: help.c:83
 msgid "  -a              Echo all input from script"
-msgstr " -a              ��ܩҦ��Ӧ۸}������J"
+msgstr " -a               ��ܩҦ��Ӧ۸}������J"
 
 #: help.c:84
 msgid "  -A              Unaligned table output mode (-P format=unaligned)"
-msgstr " -A              �D����������X�Ҧ�(-P format=unaligned)"
+msgstr " -A               �D����������X�Ҧ�(-P format=unaligned)"
 
 #: help.c:85
 msgid "  -c COMMAND      Run only single command (SQL or internal) and exit"
-msgstr " -c �R�O         �u����@���R�O(SQL �Ϊ̤���)�M��h�X"
+msgstr " -c ���O          �u����@�����O(SQL�Τ������O)�M�ᵲ��"
 
 #: help.c:91
 #, c-format
 msgid "  -d DBNAME       Specify database name to connect to (default: %s)\n"
-msgstr " -d �ƾڮw�W     ���w�n�s������Ʈw�W(�w�]: %s)\n"
+msgstr " -d ��Ʈw�W��    ���w�n�s������Ʈw�W��(�w�]: %s)\n"
 
 #: help.c:93
 msgid "  -e              Echo commands sent to server"
-msgstr " -e              ��ܵo�e�����A�����R�O"
+msgstr " -e               ��ܶǰe�����A�������O"
 
 #: help.c:94
 msgid "  -E              Display queries that internal commands generate"
-msgstr "  -E             ��ܤ����R�O���ͪ��d��"
+msgstr "  -E              ��ܤ������O���ͪ��d��"
 
 #: help.c:95
 msgid "  -f FILENAME     Execute commands from file, then exit"
-msgstr "  -f ���W      ����Ӧ��ɮת��R�O�A�M��h�X"
+msgstr "  -f �ɮצW��     �����ɮפ������O�M�ᵲ��"
 
 #: help.c:96
 #, c-format
@@ -372,7 +371,7 @@ msgstr ""
 #: help.c:101
 #, c-format
 msgid "  -h HOSTNAME     Specify database server host (default: %s)\n"
-msgstr "  -h �D���W      ���w��Ʈw���A���D�� (�w�]: %s)\n"
+msgstr "  -h �D���W��     ���w��Ʈw���A���D�� (�w�]: %s)\n"
 
 #: help.c:102
 msgid "local socket"
@@ -380,34 +379,34 @@ msgstr ""
 
 #: help.c:104
 msgid "  -H              HTML table output mode (-P format=html)"
-msgstr "  -H             HTML �����X�Ҧ� (-P format=html)"
+msgstr "  -H              HTML �����X�Ҧ� (-P format=html)"
 
 #: help.c:105
 msgid "  -l              List available databases, then exit"
-msgstr "  -l             �C�X�Ҧ��i�θ�Ʈw�A�M��h�X"
+msgstr "  -l              �C�X�Ҧ��i�θ�Ʈw�A�M��h�X"
 
 #: help.c:106
 msgid "  -n              Disable enhanced command line editing (readline)"
-msgstr "  -n             �����W�j���R�O�C�s��\�� (readline)"
+msgstr "  -n              �����W�j�����O�C�s��\\�� (readline)"
 
 #: help.c:107
 msgid "  -o FILENAME     Send query results to file (or |pipe)"
-msgstr " -o ���W       �N�d�ߵ��G�ǰe���ɮ�(�Ϊ� | �޹D)"
+msgstr " -o �ɮצW��      �N�d�ߵ��G�ǰe���ɮ�(�Ϊ� | �޹D)"
 
 #: help.c:111
 #, c-format
 msgid "  -p PORT         Specify database server port (default: %s)\n"
-msgstr " -p PORT         ���w��Ʈw���A���� (�w�]: %s)\n"
+msgstr " -p PORT          ���w��Ʈw���A���� (�w�]: %s)\n"
 
 #: help.c:114
 msgid ""
 "  -P VAR[=ARG]    Set printing option 'VAR' to 'ARG' (see \\pset command)"
 msgstr ""
-"  -P VAR[=ARG]    �⥴�L�ﶵ 'VAR' �]�m�� 'ARG' (�� \\pset �R�O)"
+"  -P VAR[=ARG]    �⥴�L�ﶵ 'VAR' �]�m�� 'ARG' (�� \\pset ���O)"
 
 #: help.c:115
 msgid "  -q              Run quietly (no messages, only query output)"
-msgstr "  -q             �w�R���� (�S���T���A�u���d�߿�X)"
+msgstr "  -q              �w�R���� (�S���T���A�u���d�߿�X)"
 
 #: help.c:116
 msgid ""
@@ -417,15 +416,15 @@ msgstr ""
 
 #: help.c:117
 msgid "  -s              Single step mode (confirm each query)"
-msgstr "  -s             ��B�Ҧ� (�T�{�C�Ӭd��)"
+msgstr "  -s              ��B�Ҧ� (�T�{�C�Ӭd��)"
 
 #: help.c:118
 msgid "  -S              Single line mode (end of line terminates SQL command)"
-msgstr "  -S             ���Ҧ� (�@�浲���P�ɤ]���ܵ� SQL �R�O����)"
+msgstr "  -S              ���Ҧ� (�@�浲���P�ɤ]���ܵ� SQL ���O����)"
 
 #: help.c:119
 msgid "  -t              Print rows only (-P tuples_only)"
-msgstr "  -t             �u�C�L�� (-P tuples_onle)"
+msgstr "  -t              �u�C�L�� (-P tuples_onle)"
 
 #: help.c:120
 msgid ""
@@ -438,27 +437,27 @@ msgstr ""
 #: help.c:126
 #, c-format
 msgid "  -U NAME         Specify database user name (default: %s)\n"
-msgstr "  -U �ϥΪ̦W��      ���w��Ʈw�ϥΪ� (�w�]: %s)\n"
+msgstr "  -U �ϥΪ̦W��   ���w��Ʈw�ϥΪ� (�w�]: %s)\n"
 
 #: help.c:128
 msgid "  -v NAME=VALUE   Set psql variable 'NAME' to 'VALUE'"
-msgstr "  -v �W��=�ƭ�   �]�w psql �ܼ� '�W��' �� '�ƭ�'"
+msgstr "  -v �W��=�ƭ�    �]�w psql �ܼ� '�W��' �� '�ƭ�'"
 
 #: help.c:129
 msgid "  -V              Show version information and exit"
-msgstr "  -V             ��ܪ�����T�M��h�X"
+msgstr "  -V              ��ܪ�����T�M�ᵲ��"
 
 #: help.c:130
 msgid "  -W              Prompt for password (should happen automatically)"
-msgstr "  -W             ���ܿ�J�K�X (���Ӧ۰ʸ߰�)"
+msgstr "  -W              ���ܿ�J�K�X (���Ӧ۰ʸ߰�)"
 
 #: help.c:131
 msgid "  -x              Turn on expanded table output (-P expanded)"
-msgstr "  -x             ���}�X�i�����X (-P expended)"
+msgstr "  -x              ���}�X�i�����X (-P expended)"
 
 #: help.c:132
 msgid "  -X              Do not read startup file (~/.psqlrc)"
-msgstr "  -X             ���nŪ���Ұ��ɮ� (~/.psqlrc)"
+msgstr "  -X              ���nŪ���Ұ��ɮ� (~/.psqlrc)"
 
 #: help.c:135
 msgid ""
@@ -470,14 +469,14 @@ msgid ""
 "Report bugs to <pgsql-bugs@postgresql.org>."
 msgstr ""
 "\n"
-"�b psql ����J \"\\?\" (�Ω󤺳��R�O) �Ϊ� \"\\help\"\n (�Ω� SQL �R�O)�A"
+"�b psql ����J \"\\?\" (�Ω󤺳����O) �Ϊ� \"\\help\"\n (�Ω� SQL ���O)�A"
 "�Ϊ̰Ѧ� PostgreSQL ���̪� psql ���`�A�H���o��h������T�C\n"
 "\n"
-"�V <pgsql-bugs@postgresql.org> �׳�����."
+"�V <pgsql-bugs@postgresql.org> �^�����~�C"
 
 #: help.c:194
 msgid " \\a             toggle between unaligned and aligned output mode\n"
-msgstr " \\a            �b�D����M�������X�Ҧ���������\n"
+msgstr " \\a             �b�D����M�������X�Ҧ���������\n"
 
 #: help.c:195
 #, c-format
@@ -490,23 +489,23 @@ msgstr ""
 
 #: help.c:198
 msgid " \\C TITLE       set table title\n"
-msgstr " \\C ���D       �]�w������D\n"
+msgstr " \\C ���D        �]�w������D\n"
 
 #: help.c:199
 msgid " \\cd [DIRNAME]  change the current working directory\n"
-msgstr " \\cd [�ؿ��W]  ���ܥثe���u�@�ؿ�\n"
+msgstr " \\cd [�ؿ��W]   ���ܥثe���u�@�ؿ�\n"
 
 #: help.c:200
 msgid " \\copy ...      perform SQL COPY with data stream to the client host\n"
-msgstr " \\copy ...     ���� SQL COPY�A��Ƭy���V�Ȥ�ݥD��\n"
+msgstr " \\copy ...      ���� SQL COPY�A��Ƭy���V�Ȥ�ݥD��\n"
 
 #: help.c:201
 msgid " \\copyright     show PostgreSQL usage and distribution terms\n"
-msgstr " \\copyright     ��� PostgreSQL �Ϊk�M�o�����\n"
+msgstr " \\copyright     ��� PostgreSQL �ϥΩM�o�����\n"
 
 #: help.c:202
 msgid " \\d TABLE       describe table (or view, index, sequence)\n"
-msgstr " \\d ��ƪ�         �y�z��ƪ� (�η��[�B���ޡB�ǦC)\n"
+msgstr " \\d ��ƪ�      �y�z��ƪ� (�η��[�B���ޡB�ǦC)\n"
 
 #: help.c:203
 msgid " \\d{t|i|s|v}... list tables/indexes/sequences/views\n"
@@ -520,23 +519,23 @@ msgstr ""
 
 #: help.c:205
 msgid " \\da            list aggregate functions\n"
-msgstr " \\da           �C�X�E�����\n"
+msgstr " \\da            �C�X�E�����\n"
 
 #: help.c:206
 msgid " \\dd NAME       show comment for table, type, function, or operator\n"
-msgstr " \\dd �W�r      ��ܸ�ƪ��B���O�B�禡�ιB��l���`��\n"
+msgstr " \\dd �W�r       ��ܸ�ƪ��B���O�B�禡�ιB��l���`��\n"
 
 #: help.c:207
 msgid " \\df            list functions\n"
-msgstr " \\df           �C�X�禡\n"
+msgstr " \\df            �C�X�禡\n"
 
 #: help.c:208
 msgid " \\do            list operators\n"
-msgstr " \\do           �C�X�B��l\n"
+msgstr " \\do            �C�X�B��l\n"
 
 #: help.c:209
 msgid " \\dT            list data types\n"
-msgstr " \\dT           �C�X��ƫ��O\n"
+msgstr " \\dT            �C�X��ƫ��O\n"
 
 #: help.c:210
 msgid ""
@@ -546,40 +545,40 @@ msgstr ""
 
 #: help.c:211
 msgid " \\echo TEXT     write text to standard output\n"
-msgstr " \\echo TEXT    �N��r�g�ܼзǿ�X\n"
+msgstr " \\echo ��r     �N��r�g�ܼзǿ�X\n"
 
 #: help.c:212
 msgid " \\encoding ENCODING  set client encoding\n"
-msgstr " \\encoding �s�X     �]�w�Ȥ�ݽs�X\n"
+msgstr " \\encoding �s�X      �]�w�Ȥ�ݽs�X\n"
 
 #: help.c:213
 msgid " \\f STRING      set field separator\n"
-msgstr " \\f �r��       �]�w�����j�Ÿ�\n"
+msgstr " \\f �r��        �]�w�����j�Ÿ�\n"
 
 #: help.c:214
 msgid ""
 " \\g FILENAME    send SQL command to server (and write results to file or "
 "|pipe)\n"
 msgstr ""
-" \\g �ɮצW��      �V���A���o�e SQL �R�O (�åB�⵲�G�g�J�ɮש� "
+" \\g �ɮצW��    �V���A���o�e SQL ���O (�åB�⵲�G�g�J�ɮש� "
 "|�޹D)\n"
 
 #: help.c:215
 msgid " \\h NAME        help on syntax of SQL commands, * for all commands\n"
-msgstr " \\h �W��       SQL �R�O���y�k�����A�� * �i�H�ݩҦ��R�O������\n"
+msgstr " \\h �W��        SQL ���O���y�k�����A�� * �i�H�ݩҦ����O������\n"
 
 #: help.c:216
 #, c-format
 msgid " \\H             toggle HTML output mode (currently %s)\n"
-msgstr " \\H            �b HTML ��X�Ҧ��������� (�ثe�O %s)\n"
+msgstr " \\H             �b HTML ��X�Ҧ��������� (�ثe�O %s)\n"
 
 #: help.c:218
 msgid " \\i FILENAME    execute commands from file\n"
-msgstr " \\i �ɮצW��     ����Ӧ��ɮת��R�O\n"
+msgstr " \\i �ɮצW��    �����ɮפ������O\n"
 
 #: help.c:219
 msgid " \\l             list all databases\n"
-msgstr " \\l            �C�X�Ҧ���Ʈw\n"
+msgstr " \\l             �C�X�Ҧ���Ʈw\n"
 
 #: help.c:220
 msgid ""
@@ -591,11 +590,11 @@ msgstr ""
 
 #: help.c:222
 msgid " \\o FILENAME    send all query results to file or |pipe\n"
-msgstr " \\o �ɮצW��     �N�d�ߵ��G�ǰe���ɮש� |�޹D\n"
+msgstr " \\o �ɮצW��    �N�d�ߵ��G�ǰe���ɮש� |�޹D\n"
 
 #: help.c:223
 msgid " \\p             show the content of the current query buffer\n"
-msgstr " \\p            ��ܥثe�d�߽w�İϪ����e\n"
+msgstr " \\p             ��ܥثe�d�߽w�İϪ����e\n"
 
 #: help.c:224
 msgid ""
@@ -603,57 +602,57 @@ msgid ""
 "                fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
 msgstr ""
 " \\pset VAR      �]�w��ƪ�����X�ﶵ (VAR := {foramt|border|expaned|\n"
-"                 fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
+"                fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
 
 #: help.c:226
 msgid " \\q             quit psql\n"
-msgstr " \\q            �h�X psql\n"
+msgstr " \\q             �h�X psql\n"
 
 #: help.c:227
 msgid " \\qecho TEXT    write text to query output stream (see \\o)\n"
-msgstr " \\qecho ��r   �N��r�g�J�d�߿�X�y (�Ѩ� \\o)\n"
+msgstr " \\qecho ��r    �N��r�g�J�d�߿�X��y (�Ѩ� \\o)\n"
 
 #: help.c:228
 msgid " \\r             reset (clear) the query buffer\n"
-msgstr " \\r            ���m (�M�z) �d�߽w�İ�\n"
+msgstr " \\r             ���m (�M�z) �d�߽w�İ�\n"
 
 #: help.c:229
 msgid " \\s FILENAME    print history or save it to file\n"
-msgstr " \\s �ɮצW��     �C�L���v�O���ε۱N���x�s���ɮ�\n"
+msgstr " \\s �ɮצW��    �C�L���v�O���ε۱N���x�s���ɮ�\n"
 
 #: help.c:230
 msgid " \\set NAME VALUE  set internal variable\n"
-msgstr " \\set �W�� �ƭ�  �]�w�����ܼ�\n"
+msgstr " \\set �W�� �ƭ�   �]�w�����ܼ�\n"
 
 #: help.c:231
 #, c-format
 msgid " \\t             show only rows (currently %s)\n"
-msgstr " \\t            �u��ܦ� (�ثe�O %s)\n"
+msgstr " \\t             �u��ܦC (�ثe�O %s)\n"
 
 #: help.c:233
 msgid " \\T TEXT        set HTML table tag attributes\n"
-msgstr " \\T �奻       �]�w HTML ��������ݩ�\n"
+msgstr " \\T �奻        �]�w HTML ��������ݩ�\n"
 
 #: help.c:234
 msgid " \\unset NAME    unset (delete) internal variable\n"
-msgstr " \\unset �W��   �R�������ܼ�\n"
+msgstr " \\unset �W��    �R�������ܼ�\n"
 
 #: help.c:235
 msgid " \\w FILENAME    write current query buffer to file\n"
-msgstr " \\w �ɮצW��     �N�ثe�d�߽w�İϼg�J�ɮ�\n"
+msgstr " \\w �ɮצW��    �N�ثe�d�߽w�İϼg�J�ɮ�\n"
 
 #: help.c:236
 #, c-format
 msgid " \\x             toggle expanded output (currently %s)\n"
-msgstr " \\x            �b�X�i��X�������� (�ثe�O %s)\n"
+msgstr " \\x             �b�X�i��X�������� (�ثe�O %s)\n"
 
 #: help.c:238
 msgid " \\z             list table access privileges\n"
-msgstr " \\z            �C�X��ƪ��s���v��\n"
+msgstr " \\z             �C�X��ƪ��s���v��\n"
 
 #: help.c:239
 msgid " \\! [COMMAND]   execute command in shell or start interactive shell\n"
-msgstr " \\! [�R�O]     �b shell �̰���R�O�ε۶}�l�@�Ӥ��� shell\n"
+msgstr " \\! [���O]      �b shell �̰�����O�ζ}�Ҥ@�� shell\n"
 
 #: help.c:266
 msgid "Available help:"
@@ -668,7 +667,7 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
-"�R�O:     %s\n"
+"���O:     %s\n"
 "�y�z:     %s\n"
 "�y�k:\n"
 "%s\n"
@@ -680,8 +679,8 @@ msgid ""
 "No help available for '%-.*s'.\n"
 "Try \\h with no arguments to see available help.\n"
 msgstr ""
-"�٨S�� '%-.*s' �������C\n"
-"�Τ��a�Ѽƪ� \\h ���o�i�λ����C\n"
+"�S�� '%-.*s' �������C\n"
+"�Τ��a�Ѽƪ� \\h ��ܥثe�֦��������C\n"
 
 #: input.c:178
 #, c-format
@@ -724,16 +723,16 @@ msgstr "
 
 #: print.c:370
 msgid "(No rows)\n"
-msgstr "(�S����)\n"
+msgstr "(�S�����)\n"
 
 #: print.c:1075
 msgid "(1 row)"
-msgstr "(1 ��)"
+msgstr "(1 �C)"
 
 #: print.c:1077
 #, c-format
 msgid "(%d rows)"
-msgstr "(%d ��)"
+msgstr "(%d �C)"
 
 #: startup.c:141 startup.c:615
 #, c-format
@@ -756,11 +755,11 @@ msgid ""
 "       \\q to quit\n"
 "\n"
 msgstr ""
-"�w��ϥ� %s, PostgreSQL �����ʱ���O�C\n"
+"�w��ϥ� %s, PostgreSQL ����r�ާ@�����C\n"
 "\n"
-"��J:  \\copyright ��ܵo�����\n"
-"       \\h ��� SQL �R�O������\n"
-"       \\? ��ܤ����ϱ׽u�R�O������\n"
+"��J:  \\copyright ��ܵo�����\n"
+"       \\h ��� SQL ���O������\n"
+"       \\? ��ܤ����ϱ׽u���O������\n"
 "       \\g �Ϊ̥H������������d��\n"
 "       \\q �h�X\n"
 "\n"
@@ -827,10 +826,10 @@ msgid ""
 "Read the file COPYRIGHT or use the command \\copyright to see the\n"
 "usage and distribution terms."
 msgstr ""
-"�������v (c) 1996-2001�APostgreSQL �}�o�p��\n"
-"�������v (c) 1996�A�[�{�j�Ǹ���\n"
-"�\Ū COPYRIGHT �Ψϥ� \\copyright �R�O�d��\n"
-"�Ϊk�M�o����ڡC"
+"Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group\n"
+"Portions Copyright (c) 1996, Regents of the University of California\n"
+"�\\Ū COPYRIGHT �ɮשΨϥ� \\copyright ���O�d��\n"
+"�ϥΩM�o����ڡC"
 
 #: startup.c:699
 #, c-format
@@ -868,7 +867,7 @@ msgstr "
 
 #: describe.c:109 describe.c:260 describe.c:1029
 msgid "Owner"
-msgstr "�Ҧ���"
+msgstr "�֦���"
 
 #: describe.c:109
 msgid "Language"
@@ -1117,11 +1116,11 @@ msgstr "
 
 #: describe.c:1072
 msgid "No matching relations found.\n"
-msgstr "�S�����ǰt�������C\n"
+msgstr "�S�����ǰt�����p�C\n"
 
 #: describe.c:1074
 msgid "No relations found.\n"
-msgstr "�S��������p�C\n"
+msgstr "�䤣�����p�C\n"
 
 #: describe.c:1079
 msgid "List of relations"