4 files changed, 1558 insertions, 628 deletions

diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk
index 4e505b6c21e..3a9cb7e7ead 100644
--- a/src/bin/scripts/nls.mk
+++ b/src/bin/scripts/nls.mk
@@ -1,6 +1,6 @@
 # $PostgreSQL: pgsql/src/bin/scripts/nls.mk,v 1.25 2010/05/13 15:56:39 petere Exp $
 CATALOG_NAME    := pgscripts
-AVAIL_LANGUAGES := cs de es fr it ja ko pt_BR ro sv ta tr zh_CN
+AVAIL_LANGUAGES := cs de es fr it ja ko pt_BR ro sv ta tr zh_CN zh_TW
 GETTEXT_FILES   := createdb.c createlang.c createuser.c \
                    dropdb.c droplang.c dropuser.c \
                    clusterdb.c vacuumdb.c reindexdb.c \
diff --git a/src/bin/scripts/po/ko.po b/src/bin/scripts/po/ko.po
index b37d751efe4..d796136f877 100644
--- a/src/bin/scripts/po/ko.po
+++ b/src/bin/scripts/po/ko.po
@@ -3,47 +3,58 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 00:40+0900\n"
-"PO-Revision-Date: 2004-12-16 02:11+0900\n"
-"Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
-"Language-Team: KOREAN <pgsql-kr@postgresql.or.kr>\n"
+"Project-Id-Version: PostgreSQL 8.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-09-09 16:34+0000\n"
+"PO-Revision-Date: 2010-09-24 12:37-0400\n"
+"Last-Translator: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: createdb.c:102 createdb.c:121 createlang.c:85 createlang.c:106
-#: createlang.c:152 createuser.c:157 createuser.c:172 dropdb.c:84 dropdb.c:93
-#: dropdb.c:101 droplang.c:96 droplang.c:117 droplang.c:164 dropuser.c:84
-#: dropuser.c:99 clusterdb.c:95 clusterdb.c:110 vacuumdb.c:112 vacuumdb.c:127
-#: reindexdb.c:111 reindexdb.c:125
+#: createdb.c:114 createdb.c:133 createlang.c:89 createlang.c:110
+#: createlang.c:163 createuser.c:149 createuser.c:164 dropdb.c:83 dropdb.c:92
+#: dropdb.c:100 droplang.c:100 droplang.c:121 droplang.c:175 dropuser.c:83
+#: dropuser.c:98 clusterdb.c:104 clusterdb.c:119 vacuumdb.c:121 vacuumdb.c:136
+#: reindexdb.c:114 reindexdb.c:128
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "���� �ڼ��� ������ \"%s --help\"\n"
 
-#: createdb.c:119 createlang.c:104 createuser.c:170 dropdb.c:99 droplang.c:115
-#: dropuser.c:97 clusterdb.c:108 vacuumdb.c:125 reindexdb.c:124
+#: createdb.c:131 createlang.c:108 createuser.c:162 dropdb.c:98 droplang.c:119
+#: dropuser.c:96 clusterdb.c:117 vacuumdb.c:134 reindexdb.c:127
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: �ʹ� ���� ������ ���ڵ� (���� \"%s\")\n"
+msgstr "%s: �ʹ� ���� ������ �μ��� (���� \"%s\")\n"
 
-#: createdb.c:129
+#: createdb.c:141
+#, c-format
+msgid "%s: only one of --locale and --lc-ctype can be specified\n"
+msgstr "%s: --locale �� --lc-ctype �� �ϳ��� ������ �� ����\n"
+
+#: createdb.c:147
+#, c-format
+msgid "%s: only one of --locale and --lc-collate can be specified\n"
+msgstr "%s: --locale �� --lc-collate �� �ϳ��� ������ �� ����\n"
+
+#: createdb.c:159
 #, c-format
 msgid "%s: \"%s\" is not a valid encoding name\n"
 msgstr "%s: \"%s\" ���ڵ��� ��� ������ ���ڵ� �̸��� �ƴ�\n"
 
-#: createdb.c:169
+#: createdb.c:204
 #, c-format
 msgid "%s: database creation failed: %s"
 msgstr "%s: �����ͺ��̽� ����� ����: %s"
 
-#: createdb.c:198
+#: createdb.c:227
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
 msgstr "%s: �ڸ�Ʈ �߰��ϱ� ���� (�����ͺ��̽��� ���������): %s"
 
-#: createdb.c:220
+#: createdb.c:244
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -52,21 +63,21 @@ msgstr ""
 "%s ���α׷��� PostgreSQL �����ͺ��̽��� ����ϴ�.\n"
 "\n"
 
-#: createdb.c:221 createlang.c:204 createuser.c:313 dropdb.c:146
-#: droplang.c:321 dropuser.c:145 clusterdb.c:234 vacuumdb.c:260
-#: reindexdb.c:332
+#: createdb.c:245 createlang.c:215 createuser.c:300 dropdb.c:140
+#: droplang.c:332 dropuser.c:139 clusterdb.c:236 vacuumdb.c:262
+#: reindexdb.c:313
 #, c-format
 msgid "Usage:\n"
 msgstr "����:\n"
 
-#: createdb.c:222
+#: createdb.c:246
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [�ɼ�]... [DB�̸�] [����]\n"
 
-#: createdb.c:223 createlang.c:206 createuser.c:315 dropdb.c:148
-#: droplang.c:323 dropuser.c:147 clusterdb.c:236 vacuumdb.c:262
-#: reindexdb.c:334
+#: createdb.c:247 createlang.c:217 createuser.c:302 dropdb.c:142
+#: droplang.c:334 dropuser.c:141 clusterdb.c:238 vacuumdb.c:264
+#: reindexdb.c:315
 #, c-format
 msgid ""
 "\n"
@@ -75,50 +86,61 @@ msgstr ""
 "\n"
 "�ɼǵ�:\n"
 
-#: createdb.c:224
+#: createdb.c:248
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
 msgstr ""
 "  -D, --tablespace=TABLESPACE  �����ͺ��̽��� ���� �⺻ ���̺������̽�\n"
 
-#: createdb.c:225
+#: createdb.c:249
+#, c-format
+msgid ""
+"  -e, --echo                   show the commands being sent to the server\n"
+msgstr "  -e, --echo                   ������ ������ �۾� ���ɵ��� ������\n"
+
+#: createdb.c:250
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
 msgstr "  -E, --encoding=ENCODING      �����ͺ��̽� ���ڵ�\n"
 
-#: createdb.c:226
+#: createdb.c:251
 #, c-format
-msgid "  -O, --owner=OWNER            database user to own the new database\n"
-msgstr "  -O, --owner=OWNER            �����ͺ��̽� ������\n"
+msgid "  -l, --locale=LOCALE          locale settings for the database\n"
+msgstr "  -l, --locale=LOCALE          �����ͺ��̽��� ��Ķ ����\n"
 
-#: createdb.c:227
+#: createdb.c:252
 #, c-format
-msgid "  -T, --template=TEMPLATE      template database to copy\n"
-msgstr "  -T, --template=TEMPLATE      ������ ���ø� �����ͺ��̽�\n"
+msgid "      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"
+msgstr "      --lc-collate=LOCALE      �����ͺ��̽��� LC_COLLATE ����\n"
 
-#: createdb.c:228
+#: createdb.c:253
 #, c-format
-msgid ""
-"  -e, --echo                   show the commands being sent to the server\n"
-msgstr "  -e, --echo                   ������ ������ �۾� ���ɵ��� ������\n"
+msgid "      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"
+msgstr "      --lc-ctype=LOCALE        �����ͺ��̽��� LC_CTYPE ����\n"
+
+#: createdb.c:254
+#, c-format
+msgid "  -O, --owner=OWNER            database user to own the new database\n"
+msgstr "  -O, --owner=OWNER            �����ͺ��̽� ������\n"
 
-#: createdb.c:229
+#: createdb.c:255
 #, c-format
-msgid "  -q, --quiet                  don't write any messages\n"
-msgstr "  -q, --quiet                  ��� �޽����� ������ ����\n"
+msgid "  -T, --template=TEMPLATE      template database to copy\n"
+msgstr "  -T, --template=TEMPLATE      ������ ���ø� �����ͺ��̽�\n"
 
-#: createdb.c:230
+#: createdb.c:256
 #, c-format
 msgid "  --help                       show this help, then exit\n"
 msgstr "  --help                       �� ������ �����ְ� ��ħ\n"
 
-#: createdb.c:231
+#: createdb.c:257
 #, c-format
 msgid "  --version                    output version information, then exit\n"
 msgstr "  --version                    ���� ������ �����ְ� ��ħ\n"
 
-#: createdb.c:232 createuser.c:335 clusterdb.c:244 vacuumdb.c:273
-#: reindexdb.c:344
+#: createdb.c:258 createlang.c:223 createuser.c:321 dropdb.c:147
+#: droplang.c:340 dropuser.c:146 clusterdb.c:247 vacuumdb.c:276
+#: reindexdb.c:325
 #, c-format
 msgid ""
 "\n"
@@ -127,29 +149,34 @@ msgstr ""
 "\n"
 "���� �ɼǵ�:\n"
 
-#: createdb.c:233
+#: createdb.c:259
 #, c-format
 msgid ""
 "  -h, --host=HOSTNAME          database server host or socket directory\n"
 msgstr ""
-"  -h, --host=HOSTNAME          �����ͺ��̽� ���� ȣ��Ʈ�� ���� ���丮\n"
+"  -h, --host=HOSTNAME          �����ͺ��̽� ���� ȣ��Ʈ�� ���� ���͸�\n"
 
-#: createdb.c:234
+#: createdb.c:260
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
 msgstr "  -p, --port=PORT              �����ͺ��̽� ���� ��Ʈ\n"
 
-#: createdb.c:235
+#: createdb.c:261
 #, c-format
 msgid "  -U, --username=USERNAME      user name to connect as\n"
 msgstr "  -U, --username=USERNAME      ������ �����\n"
 
-#: createdb.c:236
+#: createdb.c:262
+#, c-format
+msgid "  -w, --no-password            never prompt for password\n"
+msgstr "  -w, --no-password            ��ȣ ������Ʈ ǥ�� �� ��\n"
+
+#: createdb.c:263
 #, c-format
-msgid "  -W, --password               prompt for password\n"
-msgstr "  -W, --password               ��й�ȣ �Է��� ���� ������Ʈ\n"
+msgid "  -W, --password               force password prompt\n"
+msgstr "  -W, --password               ��ȣ ������Ʈ ǥ����\n"
 
-#: createdb.c:237
+#: createdb.c:264
 #, c-format
 msgid ""
 "\n"
@@ -159,9 +186,9 @@ msgstr ""
 "�ʱⰪ����, DB�̸��� �������� ������, ���� ������� �̸��� ���� �����ͺ��̽�"
 "�� ��������ϴ�.\n"
 
-#: createdb.c:238 createlang.c:216 createuser.c:342 dropdb.c:158
-#: droplang.c:333 dropuser.c:157 clusterdb.c:250 vacuumdb.c:279
-#: reindexdb.c:350
+#: createdb.c:265 createlang.c:229 createuser.c:329 dropdb.c:153
+#: droplang.c:346 dropuser.c:152 clusterdb.c:254 vacuumdb.c:283
+#: reindexdb.c:332
 #, c-format
 msgid ""
 "\n"
@@ -170,42 +197,42 @@ msgstr ""
 "\n"
 "��������: <pgsql-bugs@postgresql.org>.\n"
 
-#: createlang.c:135 droplang.c:146
+#: createlang.c:140 droplang.c:151
 msgid "Name"
 msgstr "�̸�"
 
-#: createlang.c:135 droplang.c:146
+#: createlang.c:141 droplang.c:152
 msgid "yes"
 msgstr "��"
 
-#: createlang.c:135 droplang.c:146
+#: createlang.c:141 droplang.c:152
 msgid "no"
 msgstr "�ƴϿ�"
 
-#: createlang.c:135 droplang.c:146
+#: createlang.c:142 droplang.c:153
 msgid "Trusted?"
 msgstr "�ŷڵ�?"
 
-#: createlang.c:142 droplang.c:153
+#: createlang.c:151 droplang.c:162
 msgid "Procedural Languages"
 msgstr "������ ����"
 
-#: createlang.c:151 droplang.c:162
+#: createlang.c:162 droplang.c:173
 #, c-format
 msgid "%s: missing required argument language name\n"
-msgstr "%s: �ʼ� �׸���, ��� �̸��� ������ ���ڰ� �������ϴ�\n"
+msgstr "%s: �ʼ� �׸���, ��� �̸��� ������ �μ��� �������ϴ�\n"
 
-#: createlang.c:173
+#: createlang.c:184
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
 msgstr "%s: \"%s\" ���� �̹� \"%s\" �����ͺ��̽��� ��ġ�Ǿ� �ֽ��ϴ�.\n"
 
-#: createlang.c:187
+#: createlang.c:198
 #, c-format
 msgid "%s: language installation failed: %s"
 msgstr "%s: ��� ��ġ ����: %s"
 
-#: createlang.c:203
+#: createlang.c:214
 #, c-format
 msgid ""
 "%s installs a procedural language into a PostgreSQL database.\n"
@@ -214,106 +241,112 @@ msgstr ""
 "%s ���α׷��� PostgreSQL �����ͺ��̽��� ���ν���� �� ��ġ�մϴ�.\n"
 "\n"
 
-#: createlang.c:205 droplang.c:322
+#: createlang.c:216 droplang.c:333
 #, c-format
 msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
 msgstr "  %s [�ɼ�]... ����̸� [DB�̸�]\n"
 
-#: createlang.c:207
+#: createlang.c:218
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to install language in\n"
 msgstr "  -d, --dbname=DBNAME       �� ��ġ�� DB�̸�\n"
 
-#: createlang.c:208 createuser.c:331 dropdb.c:149 droplang.c:325
-#: dropuser.c:148 clusterdb.c:240 reindexdb.c:340
+#: createlang.c:219 createuser.c:306 dropdb.c:143 droplang.c:336
+#: dropuser.c:142 clusterdb.c:241 reindexdb.c:318
 #, c-format
 msgid ""
 "  -e, --echo                show the commands being sent to the server\n"
 msgstr "  -e, --echo                ������ ������ �۾� ������ ������\n"
 
-#: createlang.c:209 droplang.c:326
+#: createlang.c:220 droplang.c:337
 #, c-format
 msgid ""
 "  -l, --list                show a list of currently installed languages\n"
 msgstr "  -l, --list                ���� ��ġ �Ǿ��ִ� ������ ������\n"
 
-#: createlang.c:210 createuser.c:336 dropdb.c:152 droplang.c:327
-#: dropuser.c:151 clusterdb.c:245 vacuumdb.c:274 reindexdb.c:345
+#: createlang.c:221 createuser.c:319 dropdb.c:145 droplang.c:338
+#: dropuser.c:144 clusterdb.c:245 reindexdb.c:323
+#, c-format
+msgid "  --help                    show this help, then exit\n"
+msgstr "  --help                    �� ������ �����ְ� ��ħ\n"
+
+#: createlang.c:222 createuser.c:320 dropdb.c:146 droplang.c:339
+#: dropuser.c:145 clusterdb.c:246 reindexdb.c:324
+#, c-format
+msgid "  --version                 output version information, then exit\n"
+msgstr "  --version                 ���� ������ �����ְ� ��ħ\n"
+
+#: createlang.c:224 createuser.c:322 dropdb.c:148 droplang.c:341
+#: dropuser.c:147 clusterdb.c:248 vacuumdb.c:277 reindexdb.c:326
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr ""
-"  -h, --host=HOSTNAME       �����ͺ��̽� ���� ȣ��Ʈ �Ǵ� ���� ���丮\n"
+"  -h, --host=HOSTNAME       �����ͺ��̽� ���� ȣ��Ʈ �Ǵ� ���� ���͸�\n"
 
-#: createlang.c:211 createuser.c:337 dropdb.c:153 droplang.c:328
-#: dropuser.c:152 clusterdb.c:246 vacuumdb.c:275 reindexdb.c:346
+#: createlang.c:225 createuser.c:323 dropdb.c:149 droplang.c:342
+#: dropuser.c:148 clusterdb.c:249 vacuumdb.c:278 reindexdb.c:327
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORT           �����ͺ��̽� ���� ��Ʈ\n"
 
-#: createlang.c:212 dropdb.c:154 droplang.c:329 clusterdb.c:247 vacuumdb.c:276
-#: reindexdb.c:347
+#: createlang.c:226 dropdb.c:150 droplang.c:343 clusterdb.c:250 vacuumdb.c:279
+#: reindexdb.c:328
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=USERNAME   ������ ������̸�\n"
 
-#: createlang.c:213 dropdb.c:155 droplang.c:330 clusterdb.c:248 vacuumdb.c:277
-#: reindexdb.c:348
-#, c-format
-msgid "  -W, --password            prompt for password\n"
-msgstr "  -W, --password            ��й�ȣ �Է��� ���� ������Ʈ\n"
-
-#: createlang.c:214 createuser.c:333 dropdb.c:156 droplang.c:331
-#: dropuser.c:155 clusterdb.c:242 reindexdb.c:342
+#: createlang.c:227 createuser.c:325 dropdb.c:151 droplang.c:344
+#: dropuser.c:150 clusterdb.c:251 vacuumdb.c:280 reindexdb.c:329
 #, c-format
-msgid "  --help                    show this help, then exit\n"
-msgstr "  --help                    �� ������ �����ְ� ��ħ\n"
+msgid "  -w, --no-password         never prompt for password\n"
+msgstr "  -w, --no-password         ��ȣ ������Ʈ ǥ�� �� ��\n"
 
-#: createlang.c:215 createuser.c:334 dropdb.c:157 droplang.c:332
-#: dropuser.c:156 clusterdb.c:243 reindexdb.c:343
+#: createlang.c:228 createuser.c:326 dropdb.c:152 droplang.c:345
+#: dropuser.c:151 clusterdb.c:252 vacuumdb.c:281 reindexdb.c:330
 #, c-format
-msgid "  --version                 output version information, then exit\n"
-msgstr "  --version                 ���� ������ �����ְ� ��ħ\n"
+msgid "  -W, --password            force password prompt\n"
+msgstr "  -W, --password            ��ȣ ������Ʈ ǥ����\n"
 
-#: createuser.c:177
+#: createuser.c:169
 msgid "Enter name of role to add: "
 msgstr "�߰��� �� ��(role)�̸�: "
 
-#: createuser.c:184
+#: createuser.c:176
 msgid "Enter password for new role: "
-msgstr "�� ���� ��й�ȣ: "
+msgstr "�� ���� ��ȣ: "
 
-#: createuser.c:185
+#: createuser.c:177
 msgid "Enter it again: "
-msgstr "��й�ȣ Ȯ��: "
+msgstr "��ȣ Ȯ��: "
 
-#: createuser.c:188
+#: createuser.c:180
 #, c-format
 msgid "Passwords didn't match.\n"
-msgstr "��й�ȣ�� ���� Ʋ��.\n"
+msgstr "��ȣ�� ���� Ʋ��.\n"
 
-#: createuser.c:197
+#: createuser.c:189
 msgid "Shall the new role be a superuser?"
-msgstr "�� ���� �������� �������� �����ұ��?"
+msgstr "�� ���� superuser �������� �����ұ��?"
 
-#: createuser.c:212
+#: createuser.c:204
 msgid "Shall the new role be allowed to create databases?"
 msgstr "�� �� �ѿ��� �����ͺ��̽��� ���� �� �ִ� ������ �ٱ��?"
 
-#: createuser.c:220
+#: createuser.c:212
 msgid "Shall the new role be allowed to create more new roles?"
 msgstr "�� �� �ѿ��� �� �ٸ� ���� ���� �� �ִ� ������ �ٱ��?"
 
-#: createuser.c:253
+#: createuser.c:245
 #, c-format
 msgid "Password encryption failed.\n"
-msgstr "��й�ȣ ��ȣȭ ����.\n"
+msgstr "��ȣ ��ȣȭ ����.\n"
 
-#: createuser.c:292
+#: createuser.c:284
 #, c-format
 msgid "%s: creation of new role failed: %s"
 msgstr "%s: �� �� ����� ����: %s"
 
-#: createuser.c:312
+#: createuser.c:299
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL role.\n"
@@ -322,52 +355,33 @@ msgstr ""
 "%s ���α׷��� PostgreSQL ���� ����ϴ�.\n"
 "\n"
 
-#: createuser.c:314 dropuser.c:146
+#: createuser.c:301 dropuser.c:140
 #, c-format
 msgid "  %s [OPTION]... [ROLENAME]\n"
 msgstr "  %s [�ɼ�]... [���̸�]\n"
 
-#: createuser.c:316
-#, c-format
-msgid "  -s, --superuser           role will be superuser\n"
-msgstr "  -s, --superuser           �������� �������� ����\n"
-
-#: createuser.c:317
+#: createuser.c:303
 #, c-format
-msgid "  -S, --no-superuser        role will not be superuser\n"
-msgstr "  -S, --no-superuser        �Ϲ� ����� �������� ����\n"
+msgid ""
+"  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
+msgstr "  -c, --connection-limit=N  ���� ���� �� (�ʱⰪ: ������)\n"
 
-#: createuser.c:318
+#: createuser.c:304
 #, c-format
 msgid "  -d, --createdb            role can create new databases\n"
 msgstr "  -d, --createdb            �� �����ͺ��̽��� ���� �� ����\n"
 
-#: createuser.c:319
+#: createuser.c:305
 #, c-format
 msgid "  -D, --no-createdb         role cannot create databases\n"
 msgstr "  -D, --no-createdb         �� �����ͺ��̽��� ���� �� ����\n"
 
-#: createuser.c:320
-#, c-format
-msgid "  -r, --createrole          role can create new roles\n"
-msgstr "  -r, --createrole          �� ���� ���� �� ����\n"
-
-#: createuser.c:321
-#, c-format
-msgid "  -R, --no-createrole       role cannot create roles\n"
-msgstr "  -R, --no-createrole       �� ���� ���� �� ����\n"
-
-#: createuser.c:322
-#, c-format
-msgid "  -l, --login               role can login (default)\n"
-msgstr "  -l, --login               �α��� ��� (�ʱⰪ)\n"
-
-#: createuser.c:323
+#: createuser.c:307
 #, c-format
-msgid "  -L, --no-login            role cannot login\n"
-msgstr "  -L, --no-login            ��� �� �� ����\n"
+msgid "  -E, --encrypted           encrypt stored password\n"
+msgstr "  -E, --encrypted           ��ȣȭ�� ��ȣ ���\n"
 
-#: createuser.c:324
+#: createuser.c:308
 #, c-format
 msgid ""
 "  -i, --inherit             role inherits privileges of roles it is a\n"
@@ -376,39 +390,52 @@ msgstr ""
 "  -i, --inherit             ���� ������ ����� �� ����\n"
 "                            (�ʱⰪ)\n"
 
-#: createuser.c:326
+#: createuser.c:310
 #, c-format
 msgid "  -I, --no-inherit          role does not inherit privileges\n"
 msgstr "  -I, --no-inherit          �� ���� ������ ����� �� ����\n"
 
-#: createuser.c:327
+#: createuser.c:311
 #, c-format
-msgid ""
-"  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
-msgstr "  -c, --connection-limit=N  ���� ���� �� (�ʱⰪ: ������)\n"
+msgid "  -l, --login               role can login (default)\n"
+msgstr "  -l, --login               �α��� ��� (�ʱⰪ)\n"
 
-#: createuser.c:328
+#: createuser.c:312
+#, c-format
+msgid "  -L, --no-login            role cannot login\n"
+msgstr "  -L, --no-login            ��� �� �� ����\n"
+
+#: createuser.c:313
+#, c-format
+msgid "  -N, --unencrypted         do not encrypt stored password\n"
+msgstr "  -N, --unencrypted         ��ȣȭ ���� ���� ��ȣ ���\n"
+
+#: createuser.c:314
 #, c-format
 msgid "  -P, --pwprompt            assign a password to new role\n"
-msgstr "  -P, --pwprompt            �� ���� ��й�ȣ ����\n"
+msgstr "  -P, --pwprompt            �� ���� ��ȣ ����\n"
 
-#: createuser.c:329
+#: createuser.c:315
 #, c-format
-msgid "  -E, --encrypted           encrypt stored password\n"
-msgstr "  -E, --encrypted           ��ȣȭ�� ��й�ȣ ���\n"
+msgid "  -r, --createrole          role can create new roles\n"
+msgstr "  -r, --createrole          �� ���� ���� �� ����\n"
+
+#: createuser.c:316
+#, c-format
+msgid "  -R, --no-createrole       role cannot create roles\n"
+msgstr "  -R, --no-createrole       �� ���� ���� �� ����\n"
 
-#: createuser.c:330
+#: createuser.c:317
 #, c-format
-msgid "  -N, --unencrypted         do not encrypt stored password\n"
-msgstr "  -N, --unencrypted         ��ȣȭ ���� ���� ��й�ȣ ���\n"
+msgid "  -s, --superuser           role will be superuser\n"
+msgstr "  -s, --superuser           superuser �������� ����\n"
 
-#: createuser.c:332 dropdb.c:151 dropuser.c:150 clusterdb.c:241
-#: reindexdb.c:341
+#: createuser.c:318
 #, c-format
-msgid "  -q, --quiet               don't write any messages\n"
-msgstr "  -q, --quiet               ��� �޽����� �������� ����\n"
+msgid "  -S, --no-superuser        role will not be superuser\n"
+msgstr "  -S, --no-superuser        �Ϲ� ����� �������� ����\n"
 
-#: createuser.c:338
+#: createuser.c:324
 #, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
@@ -416,42 +443,37 @@ msgstr ""
 "  -U, --username=USERNAME   ������ ������ �����\n"
 "                            (����ڸ���� �۾��� �� �����)\n"
 
-#: createuser.c:339 dropuser.c:154
-#, c-format
-msgid "  -W, --password            prompt for password to connect\n"
-msgstr "  -W, --password            �����۾��� �ʿ��� ��й�ȣ �Է� ������Ʈ\n"
-
-#: createuser.c:340
+#: createuser.c:327
 #, c-format
 msgid ""
 "\n"
-"If one of -s, -S, -d, -D, -r, -R and ROLENAME is not specified, you will\n"
+"If one of -d, -D, -r, -R, -s, -S, and ROLENAME is not specified, you will\n"
 "be prompted interactively.\n"
 msgstr ""
 "\n"
-"-s, -S, -d, -D, -r, -R, ���̸� ���ڵ� �� ��� �ϳ��� ������\n"
-"���α׷��� �� ���� ���� ������Ʈ�� ����, ��ȭ������ ó���� ���Դϴ�.\n"
+"-d, -D, -r, -R, -s, -S �� ROLENAME �� �ϳ��� �������� ������\n"
+"��ȭ�� ������Ʈ�� ǥ�õ˴ϴ�.\n"
 
-#: dropdb.c:92
+#: dropdb.c:91
 #, c-format
 msgid "%s: missing required argument database name\n"
 msgstr "%s: �ʼ� �׸��� �����ͺ��̽� �̸��� �������ϴ�\n"
 
-#: dropdb.c:107
+#: dropdb.c:106
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
 msgstr "\"%s\" �����ͺ��̽��� ������ ���� �� ���Դϴ�.\n"
 
-#: dropdb.c:108 dropuser.c:109
+#: dropdb.c:107 dropuser.c:108
 msgid "Are you sure?"
 msgstr "���� ��� �ұ��? (y/n) "
 
-#: dropdb.c:125
+#: dropdb.c:124
 #, c-format
 msgid "%s: database removal failed: %s"
 msgstr "%s: �����ͺ��̽� ���� ����: %s"
 
-#: dropdb.c:145
+#: dropdb.c:139
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -460,22 +482,22 @@ msgstr ""
 "%s ���α׷��� PostgreSQL �����ͺ��̽��� �����մϴ�.\n"
 "\n"
 
-#: dropdb.c:147
+#: dropdb.c:141
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [�ɼ�]... DB�̸�\n"
 
-#: dropdb.c:150 dropuser.c:149
+#: dropdb.c:144 dropuser.c:143
 #, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr "  -i, --interactive         ����� ���� �� �� �� ���\n"
 
-#: droplang.c:192
+#: droplang.c:203
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
 msgstr "%s: \"%s\" ���� \"%s\" �����ͺ��̽��� ��ġ �Ǿ����� �ʽ��ϴ�\n"
 
-#: droplang.c:212
+#: droplang.c:223
 #, c-format
 msgid ""
 "%s: still %s functions declared in language \"%s\"; language not removed\n"
@@ -483,12 +505,12 @@ msgstr ""
 "%s: ���� %s���� �Լ��� \"%s\" ��� ������� �ۼ��Ǿ� ���ǰ� �ֽ��ϴ�; �� ��"
 "��� ������ �� �����ϴ�.\n"
 
-#: droplang.c:305
+#: droplang.c:316
 #, c-format
 msgid "%s: language removal failed: %s"
 msgstr "%s: ��� ���� ����: %s"
 
-#: droplang.c:320
+#: droplang.c:331
 #, c-format
 msgid ""
 "%s removes a procedural language from a database.\n"
@@ -497,27 +519,27 @@ msgstr ""
 "%s ���α׷��� �����ͺ��̽����� ���ν���� �� �����մϴ�.\n"
 "\n"
 
-#: droplang.c:324
+#: droplang.c:335
 #, c-format
 msgid ""
 "  -d, --dbname=DBNAME       database from which to remove the language\n"
 msgstr "  -d, --dbname=DBNAME       �� ������ �����ͺ��̽�\n"
 
-#: dropuser.c:104
+#: dropuser.c:103
 msgid "Enter name of role to drop: "
 msgstr "������ �� �̸��� �Է��Ͻʽÿ�: "
 
-#: dropuser.c:108
+#: dropuser.c:107
 #, c-format
 msgid "Role \"%s\" will be permanently removed.\n"
 msgstr "\"%s\" ���� ������ ������ ���Դϴ�.\n"
 
-#: dropuser.c:124
+#: dropuser.c:123
 #, c-format
 msgid "%s: removal of role \"%s\" failed: %s"
 msgstr "%s: \"%s\" �� ���� ����: %s"
 
-#: dropuser.c:144
+#: dropuser.c:138
 #, c-format
 msgid ""
 "%s removes a PostgreSQL role.\n"
@@ -526,28 +548,28 @@ msgstr ""
 "%s ���α׷��� PostgreSQL ���� �����մϴ�.\n"
 "\n"
 
-#: dropuser.c:153
+#: dropuser.c:149
 #, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
 msgstr "  -U, --username=USERNAME   �� �۾��� ������ DB�� ������ �����\n"
 
-#: clusterdb.c:118
+#: clusterdb.c:129
 #, c-format
 msgid "%s: cannot cluster all databases and a specific one at the same time\n"
 msgstr "%s: ��� DB �۾��� Ư�� DB �۾��� ���ÿ� �� �� �����ϴ�.\n"
 
-#: clusterdb.c:124
+#: clusterdb.c:135
 #, c-format
 msgid "%s: cannot cluster a specific table in all databases\n"
 msgstr "%s: ��� DB�� ������� Ư�� ���̺��� Ŭ�������� �� �����ϴ�.\n"
 
-#: clusterdb.c:180
+#: clusterdb.c:187
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%s: \"%s\" ���̺�(�ش�DB: \"%s\") Ŭ������ �۾� ����: %s"
 
-#: clusterdb.c:183
+#: clusterdb.c:190
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
 msgstr "%s: \"%s\" �����ͺ��̽� Ŭ������ ����: %s"
@@ -557,7 +579,7 @@ msgstr "%s: \"%s\" �����ͺ��̽� Ŭ������ ����: %s"
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: \"%s\" �����ͺ��̽� Ŭ������ �۾� ��\n"
 
-#: clusterdb.c:233
+#: clusterdb.c:235
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -567,27 +589,37 @@ msgstr ""
 "�ٽ� Ŭ������ �۾��� �մϴ�.\n"
 "\n"
 
-#: clusterdb.c:235 vacuumdb.c:261 reindexdb.c:333
+#: clusterdb.c:237 vacuumdb.c:263 reindexdb.c:314
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [�ɼ�]... [DB�̸�]\n"
 
-#: clusterdb.c:237
+#: clusterdb.c:239
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 ��� �����ͺ��̽��� �������\n"
 
-#: clusterdb.c:238
+#: clusterdb.c:240
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=DBNAME       Ŭ������ �۾��� DB\n"
 
-#: clusterdb.c:239
+#: clusterdb.c:242 reindexdb.c:320
+#, c-format
+msgid "  -q, --quiet               don't write any messages\n"
+msgstr "  -q, --quiet               ��� �޽����� �������� ����\n"
+
+#: clusterdb.c:243
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table only\n"
 msgstr "  -t, --table=TABLE         ������ ���̺��� Ŭ������\n"
 
-#: clusterdb.c:249
+#: clusterdb.c:244
+#, c-format
+msgid "  -v, --verbose             write a lot of output\n"
+msgstr "  -v, --verbose             ���� ��� �ۼ�\n"
+
+#: clusterdb.c:253
 #, c-format
 msgid ""
 "\n"
@@ -596,24 +628,24 @@ msgstr ""
 "\n"
 "���� �ڼ��� ������ CLUSTER SQL ���ɾ� �������� �����Ͻʽÿ�.\n"
 
-#: vacuumdb.c:135
+#: vacuumdb.c:146
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr ""
 "%s: -a �ɼ��� ���� ���� �� �����ͺ��̽��� ������� �۾��� ������ �� ������"
 "��.\n"
 
-#: vacuumdb.c:141
+#: vacuumdb.c:152
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
 msgstr "%s: ��� �����ͺ��̽��� ������� Ư�� ���̺��� û���� ���� ����\n"
 
-#: vacuumdb.c:205
+#: vacuumdb.c:212
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%s: \"%s\" ���̺� (�ش� DB: \"%s\") û���ϱ� ����: %s"
 
-#: vacuumdb.c:208
+#: vacuumdb.c:215
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr "%s: \"%s\" �����ͺ��̽� û���ϱ� ����: %s"
@@ -623,7 +655,7 @@ msgstr "%s: \"%s\" �����ͺ��̽� û���ϱ� ����: %s"
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: \"%s\" �����ͺ��̽��� û�� ��\n"
 
-#: vacuumdb.c:259
+#: vacuumdb.c:261
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -633,60 +665,65 @@ msgstr ""
 "���� ����ȭ���� ���� �ڷḦ �����մϴ�.\n"
 "\n"
 
-#: vacuumdb.c:263
+#: vacuumdb.c:265
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       ��� �����ͺ��̽� û��\n"
 
-#: vacuumdb.c:264
+#: vacuumdb.c:266
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=DBNAME             DBNAME �����ͺ��̽� û��\n"
 
-#: vacuumdb.c:265
-#, c-format
-msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
-msgstr "  -t, --table='TABLE[(COLUMNS)]'  ������ Ư�� ���̺��� û��\n"
-
-#: vacuumdb.c:266
-#, c-format
-msgid "  -f, --full                      do full vacuuming\n"
-msgstr "  -f, --full                      ��û��\n"
-
 #: vacuumdb.c:267
 #, c-format
-msgid "  -z, --analyze                   update optimizer hints\n"
-msgstr "  -z, --analyze                   ��������ȭ�� ��Ʈ �ڷḦ ������\n"
-
-#: vacuumdb.c:268
-#, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
 "server\n"
 msgstr "  -e, --echo                      ������ ������ ���ɵ��� ������\n"
 
+#: vacuumdb.c:268
+#, c-format
+msgid "  -f, --full                      do full vacuuming\n"
+msgstr "  -f, --full                      ��û��\n"
+
 #: vacuumdb.c:269
 #, c-format
+msgid "  -F, --freeze                    freeze row transaction information\n"
+msgstr "  -F, --freeze                    �� Ʈ����� ���� ����\n"
+
+#: vacuumdb.c:270
+#, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     ��� �޽����� �������� ����\n"
 
-#: vacuumdb.c:270
+#: vacuumdb.c:271
+#, c-format
+msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
+msgstr "  -t, --table='TABLE[(COLUMNS)]'  ������ Ư�� ���̺��� û��\n"
+
+#: vacuumdb.c:272
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   �۾������� �ڼ��� ���\n"
 
-#: vacuumdb.c:271
+#: vacuumdb.c:273
+#, c-format
+msgid "  -z, --analyze                   update optimizer hints\n"
+msgstr "  -z, --analyze                   ��������ȭ�� ��Ʈ �ڷḦ ������\n"
+
+#: vacuumdb.c:274
 #, c-format
 msgid "  --help                          show this help, then exit\n"
 msgstr "  --help                          �� ������ �����ְ� ��ħ\n"
 
-#: vacuumdb.c:272
+#: vacuumdb.c:275
 #, c-format
 msgid ""
 "  --version                       output version information, then exit\n"
 msgstr "  --version                       ���� ������ �����ְ� ��ħ\n"
 
-#: vacuumdb.c:278
+#: vacuumdb.c:282
 #, c-format
 msgid ""
 "\n"
@@ -695,74 +732,74 @@ msgstr ""
 "\n"
 "���� �ڼ��� ������ VACUUM SQL ���ɾ� �������� �����Ͻʽÿ�.\n"
 
-#: reindexdb.c:133
+#: reindexdb.c:138
 #, c-format
 msgid "%s: cannot reindex all databases and a specific one at the same time\n"
 msgstr ""
 "%s: ��� �����ͺ��̽� ����� �۾��� Ư�� �����ͺ��̽� ����� �۾��� ���ÿ� ��"
 "���� �� �����ϴ�\n"
 
-#: reindexdb.c:138
+#: reindexdb.c:143
 #, c-format
 msgid "%s: cannot reindex all databases and system catalogs at the same time\n"
 msgstr ""
 "%s: ��� �����ͺ��̽� ����� �۾��� �ý��� īŻ�α� ����� �۾��� ���ÿ� ����"
 "�� �� �����ϴ�\n"
 
-#: reindexdb.c:143
+#: reindexdb.c:148
 #, c-format
 msgid "%s: cannot reindex a specific table in all databases\n"
 msgstr ""
 "%s: ��� �����ͺ��̽� ����� �۾����� Ư�� ���̺��� ����� �۾��� ������ �� "
 "�����ϴ�\n"
 
-#: reindexdb.c:148
+#: reindexdb.c:153
 #, c-format
 msgid "%s: cannot reindex a specific index in all databases\n"
 msgstr ""
 "%s: ��� �����ͺ��̽� ����� �۾����� Ư�� �ε��� ����� �۾��� ������ �� ��"
 "���ϴ�\n"
 
-#: reindexdb.c:159
+#: reindexdb.c:164
 #, c-format
 msgid ""
 "%s: cannot reindex a specific table and system catalogs at the same time\n"
 msgstr ""
 "%s: Ư�� ���̺��� �ý��� īŻ�α� ����� �۾��� ���ÿ� ������ �� �����ϴ�\n"
 
-#: reindexdb.c:164
+#: reindexdb.c:169
 #, c-format
 msgid ""
 "%s: cannot reindex a specific index and system catalogs at the same time\n"
 msgstr ""
 "%s: Ư�� �ε����� �ý��� īŻ�α� ����� �۾��� ���ÿ� ������ �� �����ϴ�\n"
 
-#: reindexdb.c:239
+#: reindexdb.c:238
 #, c-format
 msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%s: \"%s\" ���̺�(�ش�DB: \"%s\") ����� �۾� ����: %s"
 
-#: reindexdb.c:242
+#: reindexdb.c:241
 #, c-format
 msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
 msgstr "%s: \"%s\" �ε���(�ش�DB: \"%s\") ����� �۾� ����: %s"
 
-#: reindexdb.c:245
+#: reindexdb.c:244
 #, c-format
 msgid "%s: reindexing of database \"%s\" failed: %s"
 msgstr "%s: \"%s\" �����ͺ��̽� ����� �۾� ����: %s"
 
-#: reindexdb.c:280
+#: reindexdb.c:273
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
 msgstr "%s: \"%s\" �����ͺ��̽� ����� �۾� ��\n"
 
-#: reindexdb.c:311
+#: reindexdb.c:300
 #, c-format
 msgid "%s: reindexing of system catalogs failed: %s"
 msgstr "%s: �ý��� īŻ�α� ����� �۾� ����: %s"
 
-#: reindexdb.c:331
+#: reindexdb.c:312
 #, c-format
 msgid ""
 "%s reindexes a PostgreSQL database.\n"
@@ -771,32 +808,32 @@ msgstr ""
 "%s ���α׷��� PostgreSQL �����ͺ��̽� ����� �۾��� �մϴ�.\n"
 "\n"
 
-#: reindexdb.c:335
+#: reindexdb.c:316
 #, c-format
 msgid "  -a, --all                 reindex all databases\n"
 msgstr "  -a, --all                 ��� �����ͺ��̽� �����\n"
 
-#: reindexdb.c:336
-#, c-format
-msgid "  -s, --system              reindex system catalogs\n"
-msgstr "  -s, --system              �ý��� īŻ�α� �����\n"
-
-#: reindexdb.c:337
+#: reindexdb.c:317
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to reindex\n"
 msgstr "  -d, --dbname=DBNAME       ������ �����ͺ��̽��� ����� �۾�\n"
 
-#: reindexdb.c:338
-#, c-format
-msgid "  -t, --table=TABLE         reindex specific table only\n"
-msgstr "  -t, --table=TABLE         ������ ���̺��� ����� �۾�\n"
-
-#: reindexdb.c:339
+#: reindexdb.c:319
 #, c-format
 msgid "  -i, --index=INDEX         recreate specific index only\n"
 msgstr "  -i, --index=INDEX         ������ �ε����� �ٽ� ����\n"
 
-#: reindexdb.c:349
+#: reindexdb.c:321
+#, c-format
+msgid "  -s, --system              reindex system catalogs\n"
+msgstr "  -s, --system              �ý��� īŻ�α� �����\n"
+
+#: reindexdb.c:322
+#, c-format
+msgid "  -t, --table=TABLE         reindex specific table only\n"
+msgstr "  -t, --table=TABLE         ������ ���̺��� ����� �۾�\n"
+
+#: reindexdb.c:331
 #, c-format
 msgid ""
 "\n"
@@ -805,56 +842,76 @@ msgstr ""
 "\n"
 "���� �ڼ��� ������ REINDEX SQL ���ɾ� �������� �����Ͻʽÿ�.\n"
 
-#: common.c:39
+#: common.c:45
 #, c-format
 msgid "%s: could not obtain information about current user: %s\n"
 msgstr "%s: ���� ����� ������ ���� �� ����: %s\n"
 
-#: common.c:50
+#: common.c:56
 #, c-format
 msgid "%s: could not get current user name: %s\n"
 msgstr "%s: ���� ����� �̸��� ���� �� ����: %s\n"
 
-#: common.c:97 common.c:123
+#: common.c:103 common.c:127
 msgid "Password: "
-msgstr "��й�ȣ:"
+msgstr "��ȣ:"
 
-#: common.c:110
+#: common.c:116
 #, c-format
 msgid "%s: could not connect to database %s\n"
 msgstr "%s: %s �����ͺ��̽��� ���� �� �� ����\n"
 
-#: common.c:133
+#: common.c:138
 #, c-format
 msgid "%s: could not connect to database %s: %s"
 msgstr "%s: %s �����ͺ��̽��� ���� �� �� ����: %s"
 
-#: common.c:157 common.c:185
+#: common.c:162 common.c:190
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: ���� ����: %s"
 
-#: common.c:159 common.c:187
+#: common.c:164 common.c:192
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: ���� ����: %s\n"
 
+#: common.c:238
+#, c-format
+msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
+msgstr "pg_strdup: null �����͸� �ߺ��� �� ����(���� ����)\n"
+
+#: common.c:244
+#, c-format
+msgid "out of memory\n"
+msgstr "�޸� ����\n"
+
 #. translator: abbreviation for "yes"
-#: common.c:202
+#: common.c:255
 msgid "y"
 msgstr "y"
 
 #. translator: abbreviation for "no"
-#: common.c:204
+#: common.c:257
 msgid "n"
 msgstr "n"
 
-#: common.c:215
+#: common.c:268
 #, c-format
 msgid "%s (%s/%s) "
 msgstr "%s (%s/%s) "
 
-#: common.c:236
+#: common.c:289
 #, c-format
 msgid "Please answer \"%s\" or \"%s\".\n"
 msgstr "\"%s\" �Ǵ� \"%s\" �� ����մϴ�.\n"
+
+#: common.c:367 common.c:400
+#, c-format
+msgid "Cancel request sent\n"
+msgstr "��� ��û�� ������\n"
+
+#: common.c:369 common.c:402
+#, c-format
+msgid "Could not send cancel request: %s"
+msgstr "��� ��û�� ������ �� ����: %s"
diff --git a/src/bin/scripts/po/zh_CN.po b/src/bin/scripts/po/zh_CN.po
index 12e57ec5a9b..5e0b373f2c6 100644
--- a/src/bin/scripts/po/zh_CN.po
+++ b/src/bin/scripts/po/zh_CN.po
@@ -4,78 +4,55 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.4\n"
+"Project-Id-Version: pgscripts (PostgreSQL 9.0)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-02-19 01:52+0000\n"
-"PO-Revision-Date: 2010-03-30 14:41+0800\n"
+"POT-Creation-Date: 2010-10-01 14:40+0000\n"
+"PO-Revision-Date: 2010-10-01 12:52+0800\n"
 "Last-Translator: Weibin <ssmei_2000@yahoo.com>\n"
-"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
+"Language-Team: Chinese (Simplified)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=GB2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: createdb.c:114
-#: createdb.c:133
-#: createlang.c:89
-#: createlang.c:110
-#: createlang.c:163
-#: createuser.c:149
-#: createuser.c:164
-#: dropdb.c:83
-#: dropdb.c:92
-#: dropdb.c:100
-#: droplang.c:100
-#: droplang.c:121
-#: droplang.c:175
-#: dropuser.c:83
-#: dropuser.c:98
-#: clusterdb.c:104
-#: clusterdb.c:119
-#: vacuumdb.c:121
-#: vacuumdb.c:136
-#: reindexdb.c:114
-#: reindexdb.c:128
+#: createdb.c:114 createdb.c:133 createlang.c:89 createlang.c:110
+#: createlang.c:163 createuser.c:149 createuser.c:164 dropdb.c:83 dropdb.c:92
+#: dropdb.c:100 droplang.c:100 droplang.c:121 droplang.c:175 dropuser.c:83
+#: dropuser.c:98 clusterdb.c:104 clusterdb.c:119 vacuumdb.c:127 vacuumdb.c:142
+#: reindexdb.c:114 reindexdb.c:128
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "���� \"%s --help\" ��ȡ�������Ϣ.\n"
-
-#: createdb.c:131
-#: createlang.c:108
-#: createuser.c:162
-#: dropdb.c:98
-#: droplang.c:119
-#: dropuser.c:96
-#: clusterdb.c:117
-#: vacuumdb.c:134
-#: reindexdb.c:127
+msgstr "请用 \"%s --help\" 获取更多的信息.\n"
+
+#: createdb.c:131 createlang.c:108 createuser.c:162 dropdb.c:98 droplang.c:119
+#: dropuser.c:96 clusterdb.c:117 vacuumdb.c:140 reindexdb.c:127
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: ̫��������в��� (��һ���� \"%s\")\n"
+msgstr "%s: 太多的命令行参数 (第一个是 \"%s\")\n"
 
 #: createdb.c:141
 #, c-format
 msgid "%s: only one of --locale and --lc-ctype can be specified\n"
-msgstr "%s: ֻ��ָ��--locale��--lc-ctype������ѡ��֮һ\n"
+msgstr "%s: 只能指定--locale和--lc-ctype这两个选项之一\n"
 
 #: createdb.c:147
 #, c-format
 msgid "%s: only one of --locale and --lc-collate can be specified\n"
-msgstr "%s: ֻ��ָ��--locale��--lc-collate������ѡ��֮һ\n"
+msgstr "%s: 只能指定--locale和--lc-collate这两个选项之一\n"
 
 #: createdb.c:159
 #, c-format
 msgid "%s: \"%s\" is not a valid encoding name\n"
-msgstr "%s: \"%s\" ����һ����Ч�ı�������\n"
+msgstr "%s: \"%s\" 不是一个有效的编码名称\n"
 
 #: createdb.c:204
 #, c-format
 msgid "%s: database creation failed: %s"
-msgstr "%s: �������ݿ�ʧ��: %s"
+msgstr "%s: 创建数据库失败: %s"
 
 #: createdb.c:227
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
-msgstr "%s: ����ע��ʧ�� (���ݿ��Ѵ���): %s"
+msgstr "%s: 创建注释失败 (数据库已创建): %s"
 
 #: createdb.c:244
 #, c-format
@@ -83,35 +60,23 @@ msgid ""
 "%s creates a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s ����һ�� PostgreSQL ���ݿ�.\n"
+"%s 创建一个 PostgreSQL 数据库.\n"
 "\n"
 
-#: createdb.c:245
-#: createlang.c:215
-#: createuser.c:300
-#: dropdb.c:140
-#: droplang.c:332
-#: dropuser.c:139
-#: clusterdb.c:236
-#: vacuumdb.c:262
+#: createdb.c:245 createlang.c:215 createuser.c:300 dropdb.c:140
+#: droplang.c:374 dropuser.c:139 clusterdb.c:236 vacuumdb.c:328
 #: reindexdb.c:313
 #, c-format
 msgid "Usage:\n"
-msgstr "ʹ�÷���:\n"
+msgstr "使用方法:\n"
 
 #: createdb.c:246
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
-msgstr "  %s [ѡ��]... [���ݿ�����] [����]\n"
-
-#: createdb.c:247
-#: createlang.c:217
-#: createuser.c:302
-#: dropdb.c:142
-#: droplang.c:334
-#: dropuser.c:141
-#: clusterdb.c:238
-#: vacuumdb.c:264
+msgstr "  %s [选项]... [数据库名称] [描述]\n"
+
+#: createdb.c:247 createlang.c:217 createuser.c:302 dropdb.c:142
+#: droplang.c:376 dropuser.c:141 clusterdb.c:238 vacuumdb.c:330
 #: reindexdb.c:315
 #, c-format
 msgid ""
@@ -119,66 +84,61 @@ msgid ""
 "Options:\n"
 msgstr ""
 "\n"
-"ѡ��:\n"
+"选项:\n"
 
 #: createdb.c:248
 #, c-format
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
-msgstr "  -D, --tablespace=TABLESPACE  ���ݿ�Ĭ�ϱ��ռ�\n"
+msgstr "  -D, --tablespace=TABLESPACE  数据库默认表空间\n"
 
 #: createdb.c:249
 #, c-format
-msgid "  -e, --echo                   show the commands being sent to the server\n"
-msgstr "  -e, --echo                   ��ʾ���͵�����˵�����\n"
+msgid ""
+"  -e, --echo                   show the commands being sent to the server\n"
+msgstr "  -e, --echo                   显示发送到服务端的命令\n"
 
 #: createdb.c:250
 #, c-format
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
-msgstr "  -E, --encoding=ENCODING      ���ݿ����\n"
+msgstr "  -E, --encoding=ENCODING      数据库编码\n"
 
 #: createdb.c:251
 #, c-format
 msgid "  -l, --locale=LOCALE          locale settings for the database\n"
-msgstr "  -O, --owner=OWNER            �����ݿ�������û�\n"
+msgstr "  -O, --owner=OWNER            新数据库的所属用户\n"
 
 #: createdb.c:252
 #, c-format
 msgid "      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"
-msgstr "      --lc-collate=LOCALE      ���ݿ��LC_COLLATE����\n"
+msgstr "      --lc-collate=LOCALE      数据库的LC_COLLATE设置\n"
 
 #: createdb.c:253
 #, c-format
 msgid "      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"
-msgstr "      --lc-ctype=LOCALE        ���ݿ��LC_CTYPE����\n"
+msgstr "      --lc-ctype=LOCALE        数据库的LC_CTYPE设置\n"
 
 #: createdb.c:254
 #, c-format
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
-msgstr "  -O, --owner=OWNER            �����ݿ�������û�\n"
+msgstr "  -O, --owner=OWNER            新数据库的所属用户\n"
 
 #: createdb.c:255
 #, c-format
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
-msgstr "  -T, --template=TEMPLATE      Ҫ���������ݿ�ģ��\n"
+msgstr "  -T, --template=TEMPLATE      要拷贝的数据库模板\n"
 
 #: createdb.c:256
 #, c-format
 msgid "  --help                       show this help, then exit\n"
-msgstr "  --help                       ��ʾ�˰�����Ϣ, Ȼ���˳�\n"
+msgstr "  --help                       显示此帮助信息, 然后退出\n"
 
 #: createdb.c:257
 #, c-format
 msgid "  --version                    output version information, then exit\n"
-msgstr "  --versoin                    ����汾��Ϣ, Ȼ���˳�\n"
-
-#: createdb.c:258
-#: createlang.c:223
-#: createuser.c:321
-#: dropdb.c:147
-#: droplang.c:340
-#: dropuser.c:146
-#: clusterdb.c:247
-#: vacuumdb.c:276
+msgstr "  --versoin                    输出版本信息, 然后退出\n"
+
+#: createdb.c:258 createlang.c:223 createuser.c:321 dropdb.c:147
+#: droplang.c:382 dropuser.c:146 clusterdb.c:247 vacuumdb.c:343
 #: reindexdb.c:325
 #, c-format
 msgid ""
@@ -186,32 +146,34 @@ msgid ""
 "Connection options:\n"
 msgstr ""
 "\n"
-"����ѡ��:\n"
+"联接选项:\n"
 
 #: createdb.c:259
 #, c-format
-msgid "  -h, --host=HOSTNAME          database server host or socket directory\n"
-msgstr "  -h, --host=HOSTNAME          ���ݿ���������ڻ��������������׽���Ŀ¼\n"
+msgid ""
+"  -h, --host=HOSTNAME          database server host or socket directory\n"
+msgstr ""
+"  -h, --host=HOSTNAME          数据库服务器所在机器的主机名或套接字目录\n"
 
 #: createdb.c:260
 #, c-format
 msgid "  -p, --port=PORT              database server port\n"
-msgstr "  -p, --port=PORT              ���ݿ�������˿ں�\n"
+msgstr "  -p, --port=PORT              数据库服务器端口号\n"
 
 #: createdb.c:261
 #, c-format
 msgid "  -U, --username=USERNAME      user name to connect as\n"
-msgstr "  -U, --username=USERNAME      ���ӵ��û���\n"
+msgstr "  -U, --username=USERNAME      联接的用户名\n"
 
 #: createdb.c:262
 #, c-format
 msgid "  -w, --no-password            never prompt for password\n"
-msgstr "  -w, --no-password           ��Զ����ʾ�������\n"
+msgstr "  -w, --no-password           永远不提示输入口令\n"
 
 #: createdb.c:263
 #, c-format
 msgid "  -W, --password               force password prompt\n"
-msgstr "  -W, --password              ǿ����ʾ�������\n"
+msgstr "  -W, --password              强制提示输入口令\n"
 
 #: createdb.c:264
 #, c-format
@@ -220,16 +182,10 @@ msgid ""
 "By default, a database with the same name as the current user is created.\n"
 msgstr ""
 "\n"
-"Ĭ�������, �Ե�ǰ�û����û����������ݿ�.\n"
+"默认情况下, 以当前用户的用户名创建数据库.\n"
 
-#: createdb.c:265
-#: createlang.c:229
-#: createuser.c:329
-#: dropdb.c:153
-#: droplang.c:346
-#: dropuser.c:152
-#: clusterdb.c:254
-#: vacuumdb.c:283
+#: createdb.c:265 createlang.c:229 createuser.c:329 dropdb.c:153
+#: droplang.c:388 dropuser.c:152 clusterdb.c:254 vacuumdb.c:350
 #: reindexdb.c:332
 #, c-format
 msgid ""
@@ -237,48 +193,42 @@ msgid ""
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"���汨���� <pgsql-bugs@postgresql.org>.\n"
+"臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
 
-#: createlang.c:140
-#: droplang.c:151
+#: createlang.c:140 droplang.c:151
 msgid "Name"
-msgstr "����"
+msgstr "名字"
 
-#: createlang.c:141
-#: droplang.c:152
+#: createlang.c:141 droplang.c:152
 msgid "yes"
 msgstr "yes"
 
-#: createlang.c:141
-#: droplang.c:152
+#: createlang.c:141 droplang.c:152
 msgid "no"
 msgstr "no"
 
-#: createlang.c:142
-#: droplang.c:153
+#: createlang.c:142 droplang.c:153
 msgid "Trusted?"
-msgstr "�Ƿ�����?"
+msgstr "是否信任?"
 
-#: createlang.c:151
-#: droplang.c:162
+#: createlang.c:151 droplang.c:162
 msgid "Procedural Languages"
-msgstr "��������"
+msgstr "过程语言"
 
-#: createlang.c:162
-#: droplang.c:173
+#: createlang.c:162 droplang.c:173
 #, c-format
 msgid "%s: missing required argument language name\n"
-msgstr "%s: ȱ��Ҫ����������Ʋ���\n"
+msgstr "%s: 缺少要求的语言名称参数\n"
 
 #: createlang.c:184
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
-msgstr "%1$s: ���ݿ� \"%3$s\" ���Ѿ���װ������ \"%2$s\"\n"
+msgstr "%1$s: 数据库 \"%3$s\" 中已经安装了语言 \"%2$s\"\n"
 
 #: createlang.c:198
 #, c-format
 msgid "%s: language installation failed: %s"
-msgstr "%s: ���԰�װʧ��: %s"
+msgstr "%s: 语言安装失败: %s"
 
 #: createlang.c:214
 #, c-format
@@ -286,155 +236,112 @@ msgid ""
 "%s installs a procedural language into a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s ��װһ���������Խ� PostgreSQL ���ݿ�.\n"
+"%s 安装一个过程语言进 PostgreSQL 数据库.\n"
 "\n"
 
-#: createlang.c:216
-#: droplang.c:333
+#: createlang.c:216 droplang.c:375
 #, c-format
 msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
-msgstr "  %s [ѡ��]... �������� [���ݿ���]\n"
+msgstr "  %s [选项]... 语言名称 [数据库名]\n"
 
 #: createlang.c:218
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to install language in\n"
-msgstr "  -d, --dbname=DBNAME       Ҫ��װ���Ե����ݿ�\n"
+msgstr "  -d, --dbname=DBNAME       要安装语言的数据库\n"
 
-#: createlang.c:219
-#: createuser.c:306
-#: dropdb.c:143
-#: droplang.c:336
-#: dropuser.c:142
-#: clusterdb.c:241
-#: reindexdb.c:318
+#: createlang.c:219 createuser.c:306 dropdb.c:143 droplang.c:378
+#: dropuser.c:142 clusterdb.c:241 reindexdb.c:318
 #, c-format
-msgid "  -e, --echo                show the commands being sent to the server\n"
-msgstr "  -e, --echo                ��ʾ���͵�����˵�����\n"
+msgid ""
+"  -e, --echo                show the commands being sent to the server\n"
+msgstr "  -e, --echo                显示发送到服务端的命令\n"
 
-#: createlang.c:220
-#: droplang.c:337
+#: createlang.c:220 droplang.c:379
 #, c-format
-msgid "  -l, --list                show a list of currently installed languages\n"
-msgstr "  -l, --list                ��ʾ��ǰ�Ѿ���װ�˵������б�\n"
+msgid ""
+"  -l, --list                show a list of currently installed languages\n"
+msgstr "  -l, --list                显示当前已经安装了的语言列表\n"
 
-#: createlang.c:221
-#: createuser.c:319
-#: dropdb.c:145
-#: droplang.c:338
-#: dropuser.c:144
-#: clusterdb.c:245
-#: reindexdb.c:323
+#: createlang.c:221 createuser.c:319 dropdb.c:145 droplang.c:380
+#: dropuser.c:144 clusterdb.c:245 reindexdb.c:323
 #, c-format
 msgid "  --help                    show this help, then exit\n"
-msgstr "  --help                    ��ʾ�˰�����Ϣ, Ȼ���˳�\n"
+msgstr "  --help                    显示此帮助信息, 然后退出\n"
 
-#: createlang.c:222
-#: createuser.c:320
-#: dropdb.c:146
-#: droplang.c:339
-#: dropuser.c:145
-#: clusterdb.c:246
-#: reindexdb.c:324
+#: createlang.c:222 createuser.c:320 dropdb.c:146 droplang.c:381
+#: dropuser.c:145 clusterdb.c:246 reindexdb.c:324
 #, c-format
 msgid "  --version                 output version information, then exit\n"
-msgstr "  --version                 ����汾��Ϣ, Ȼ���˳�\n"
+msgstr "  --version                 输出版本信息, 然后退出\n"
 
-#: createlang.c:224
-#: createuser.c:322
-#: dropdb.c:148
-#: droplang.c:341
-#: dropuser.c:147
-#: clusterdb.c:248
-#: vacuumdb.c:277
-#: reindexdb.c:326
+#: createlang.c:224 createuser.c:322 dropdb.c:148 droplang.c:383
+#: dropuser.c:147 clusterdb.c:248 vacuumdb.c:344 reindexdb.c:326
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
-msgstr "  -h, --host=HOSTNAM        ���ݿ���������ڻ��������������׽���Ŀ¼\n"
-
-#: createlang.c:225
-#: createuser.c:323
-#: dropdb.c:149
-#: droplang.c:342
-#: dropuser.c:148
-#: clusterdb.c:249
-#: vacuumdb.c:278
-#: reindexdb.c:327
+msgstr "  -h, --host=HOSTNAM        数据库服务器所在机器的主机名或套接字目录\n"
+
+#: createlang.c:225 createuser.c:323 dropdb.c:149 droplang.c:384
+#: dropuser.c:148 clusterdb.c:249 vacuumdb.c:345 reindexdb.c:327
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
-msgstr "  -p, --port=PORT           ���ݿ�������˿ں�\n"
+msgstr "  -p, --port=PORT           数据库服务器端口号\n"
 
-#: createlang.c:226
-#: dropdb.c:150
-#: droplang.c:343
-#: clusterdb.c:250
-#: vacuumdb.c:279
+#: createlang.c:226 dropdb.c:150 droplang.c:385 clusterdb.c:250 vacuumdb.c:346
 #: reindexdb.c:328
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
-msgstr "  -U, --username=USERNAME   ���ӵ��û���\n"
+msgstr "  -U, --username=USERNAME   联接的用户名\n"
 
-#: createlang.c:227
-#: createuser.c:325
-#: dropdb.c:151
-#: droplang.c:344
-#: dropuser.c:150
-#: clusterdb.c:251
-#: vacuumdb.c:280
-#: reindexdb.c:329
+#: createlang.c:227 createuser.c:325 dropdb.c:151 droplang.c:386
+#: dropuser.c:150 clusterdb.c:251 vacuumdb.c:347 reindexdb.c:329
 #, c-format
 msgid "  -w, --no-password         never prompt for password\n"
-msgstr "  -w, -no-password         ��Զ����ʾ�������\n"
-
-#: createlang.c:228
-#: createuser.c:326
-#: dropdb.c:152
-#: droplang.c:345
-#: dropuser.c:151
-#: clusterdb.c:252
-#: vacuumdb.c:281
-#: reindexdb.c:330
+msgstr "  -w, -no-password         永远不提示输入口令\n"
+
+#: createlang.c:228 createuser.c:326 dropdb.c:152 droplang.c:387
+#: dropuser.c:151 clusterdb.c:252 vacuumdb.c:348 reindexdb.c:330
 #, c-format
 msgid "  -W, --password            force password prompt\n"
-msgstr "  -W, --password            ǿ����ʾ�������\n"
+msgstr "  -W, --password            强制提示输入口令\n"
 
 #: createuser.c:169
 msgid "Enter name of role to add: "
-msgstr "����Ҫ���ӵĽ�ɫ����: "
+msgstr "输入要增加的角色名称: "
 
 #: createuser.c:176
 msgid "Enter password for new role: "
-msgstr "Ϊ�½�ɫ����Ŀ���: "
+msgstr "为新角色输入的口令: "
 
 #: createuser.c:177
 msgid "Enter it again: "
-msgstr "������һ��: "
+msgstr "再输入一遍: "
 
 #: createuser.c:180
 #, c-format
 msgid "Passwords didn't match.\n"
-msgstr "���ƥ��.\n"
+msgstr "口令不匹配.\n"
 
 #: createuser.c:189
 msgid "Shall the new role be a superuser?"
-msgstr "�µĽ�ɫ�Ƿ��dz����û�?"
+msgstr "新的角色是否是超级用户?"
 
 #: createuser.c:204
 msgid "Shall the new role be allowed to create databases?"
-msgstr "�µĽ�ɫ�����������ݿ���?"
+msgstr "新的角色允许创建数据库吗?"
 
 #: createuser.c:212
 msgid "Shall the new role be allowed to create more new roles?"
-msgstr "�½�ɫ�������������µĽ�ɫ��? "
+msgstr "新角色允许创建其它新的角色吗? "
 
 #: createuser.c:245
 #, c-format
 msgid "Password encryption failed.\n"
-msgstr "�������ʧ��.\n"
+msgstr "密码加密失败.\n"
 
 #: createuser.c:284
 #, c-format
 msgid "%s: creation of new role failed: %s"
-msgstr "%s: �������û�ʧ��: %s"
+msgstr "%s: 创建新用户失败: %s"
 
 #: createuser.c:299
 #, c-format
@@ -442,34 +349,34 @@ msgid ""
 "%s creates a new PostgreSQL role.\n"
 "\n"
 msgstr ""
-"%s ����һ���µ� PostgreSQL �û�.\n"
+"%s 创建一个新的 PostgreSQL 用户.\n"
 "\n"
 
-#: createuser.c:301
-#: dropuser.c:140
+#: createuser.c:301 dropuser.c:140
 #, c-format
 msgid "  %s [OPTION]... [ROLENAME]\n"
-msgstr "  %s [ѡ��]... [�û���]\n"
+msgstr "  %s [选项]... [用户名]\n"
 
 #: createuser.c:303
 #, c-format
-msgid "  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
-msgstr "  -c, --connection-limit=N  ��ɫ����������(ȱʡ: û������)\n"
+msgid ""
+"  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
+msgstr "  -c, --connection-limit=N  角色的连接限制(缺省: 没有限制)\n"
 
 #: createuser.c:304
 #, c-format
 msgid "  -d, --createdb            role can create new databases\n"
-msgstr "  -d, --createdb            �˽�ɫ���Դ��������ݿ�\n"
+msgstr "  -d, --createdb            此角色可以创建新数据库\n"
 
 #: createuser.c:305
 #, c-format
 msgid "  -D, --no-createdb         role cannot create databases\n"
-msgstr "  -D, --no-createdb         �˽�ɫ�����Դ��������ݿ�\n"
+msgstr "  -D, --no-createdb         此角色不可以创建新数据库\n"
 
 #: createuser.c:307
 #, c-format
 msgid "  -E, --encrypted           encrypt stored password\n"
-msgstr "  -E, --encrypted           ������ܴ洢\n"
+msgstr "  -E, --encrypted           口令加密存储\n"
 
 #: createuser.c:308
 #, c-format
@@ -477,58 +384,59 @@ msgid ""
 "  -i, --inherit             role inherits privileges of roles it is a\n"
 "                            member of (default)\n"
 msgstr ""
-"  -i, --inherit            ��ɫ�ܹ��̳���������ɫ��Ȩ��\n"
-"                   ������ȱʡ���)\n"
+"  -i, --inherit            角色能够继承它所属角色的权限\n"
+"                   （这是缺省情况)\n"
 
 #: createuser.c:310
 #, c-format
 msgid "  -I, --no-inherit          role does not inherit privileges\n"
-msgstr "  -I, --no-inherit          ��ɫ���̳�Ȩ��\n"
+msgstr "  -I, --no-inherit          角色不继承权限\n"
 
 #: createuser.c:311
 #, c-format
 msgid "  -l, --login               role can login (default)\n"
-msgstr "  -l, --login              ��ɫ�ܹ���¼(����ȱʡ���)\n"
+msgstr "  -l, --login              角色能够登录(这是缺省情况)\n"
 
 #: createuser.c:312
 #, c-format
 msgid "  -L, --no-login            role cannot login\n"
-msgstr "  -L, --no-login            ��ɫ���ܵ�¼\n"
+msgstr "  -L, --no-login            角色不能登录\n"
 
 #: createuser.c:313
 #, c-format
 msgid "  -N, --unencrypted         do not encrypt stored password\n"
-msgstr "  -N, --unencrypted         ������ܴ洢\n"
+msgstr "  -N, --unencrypted         口令不加密存储\n"
 
 #: createuser.c:314
 #, c-format
 msgid "  -P, --pwprompt            assign a password to new role\n"
-msgstr "  -P, --pwprompt            ���½�ɫָ������\n"
+msgstr "  -P, --pwprompt            给新角色指定口令\n"
 
 #: createuser.c:315
 #, c-format
 msgid "  -r, --createrole          role can create new roles\n"
-msgstr "  -r, --createrole        �����ɫ���Դ����µĽ�ɫ\n"
+msgstr "  -r, --createrole        这个角色可以创建新的角色\n"
 
 #: createuser.c:316
 #, c-format
 msgid "  -R, --no-createrole       role cannot create roles\n"
-msgstr "  -R, --no-createrole       �����ɫû�д���������ɫ��Ȩ��\n"
+msgstr "  -R, --no-createrole       这个角色没有创建其它角色的权限\n"
 
 #: createuser.c:317
 #, c-format
 msgid "  -s, --superuser           role will be superuser\n"
-msgstr "  -s, --superuser          ��ɫ���dz����û�\n"
+msgstr "  -s, --superuser          角色将是超级用户\n"
 
 #: createuser.c:318
 #, c-format
 msgid "  -S, --no-superuser        role will not be superuser\n"
-msgstr "  -S, --no-superuser       ��ɫ�����dz����û�\n"
+msgstr "  -S, --no-superuser       角色不能是超级用户\n"
 
 #: createuser.c:324
 #, c-format
-msgid "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
-msgstr "  -U, --username=USERNAME   �����û� (����Ҫ�������û���)\n"
+msgid ""
+"  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
+msgstr "  -U, --username=USERNAME   联接用户 (不是要创建的用户名)\n"
 
 #: createuser.c:327
 #, c-format
@@ -538,28 +446,27 @@ msgid ""
 "be prompted interactively.\n"
 msgstr ""
 "\n"
-"��� -d, -D, -r, -R, -s, -S �� ROLENAME һ����û��ָ��,��ʹ�ý���ʽ��ʾ\n"
-"��.\n"
+"如果 -d, -D, -r, -R, -s, -S 和 ROLENAME 一个都没有指定,将使用交互式提示\n"
+"你.\n"
 
 #: dropdb.c:91
 #, c-format
 msgid "%s: missing required argument database name\n"
-msgstr "%s: ȱ����Ҫ�����ݿ�������\n"
+msgstr "%s: 缺少需要的数据库名参数\n"
 
 #: dropdb.c:106
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
-msgstr "���ݿ� \"%s\" �������õ�ɾ��.\n"
+msgstr "数据库 \"%s\" 将被永久的删除.\n"
 
-#: dropdb.c:107
-#: dropuser.c:108
+#: dropdb.c:107 dropuser.c:108
 msgid "Are you sure?"
-msgstr "��ȷ����? (y/n) "
+msgstr "您确定吗? (y/n) "
 
 #: dropdb.c:124
 #, c-format
 msgid "%s: database removal failed: %s"
-msgstr "%s: ���ݿ�ɾ��ʧ��: %s"
+msgstr "%s: 数据库删除失败: %s"
 
 #: dropdb.c:139
 #, c-format
@@ -567,62 +474,63 @@ msgid ""
 "%s removes a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s ɾ��һ�� PostgreSQL ���ݿ�.\n"
+"%s 删除一个 PostgreSQL 数据库.\n"
 "\n"
 
 #: dropdb.c:141
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
-msgstr "  %s [ѡ��]... ���ݿ���\n"
+msgstr "  %s [选项]... 数据库名\n"
 
-#: dropdb.c:144
-#: dropuser.c:143
+#: dropdb.c:144 dropuser.c:143
 #, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
-msgstr "  -i, --interactive         ɾ���κζ���֮ǰ������ʾ\n"
+msgstr "  -i, --interactive         删除任何东西之前给予提示\n"
 
 #: droplang.c:203
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
-msgstr "%1$s: ���ݿ� \"%3$s\" ��, û�а�װ���� \"%2$s\"\n"
+msgstr "%1$s: 数据库 \"%3$s\" 中, 没有安装语言 \"%2$s\"\n"
 
-#: droplang.c:223
+#: droplang.c:224
 #, c-format
-msgid "%s: still %s functions declared in language \"%s\"; language not removed\n"
-msgstr "%s: ���� %s �������� \"%s\" ������; ����δ��ɾ��\n"
+msgid ""
+"%s: still %s functions declared in language \"%s\"; language not removed\n"
+msgstr "%s: 函数 %s 是用语言 \"%s\" 声明的; 语言未被删除\n"
 
-#: droplang.c:316
+#: droplang.c:358
 #, c-format
 msgid "%s: language removal failed: %s"
-msgstr "%s: ����ɾ��ʧ��: %s"
+msgstr "%s: 语言删除失败: %s"
 
-#: droplang.c:331
+#: droplang.c:373
 #, c-format
 msgid ""
 "%s removes a procedural language from a database.\n"
 "\n"
 msgstr ""
-"%s �����ݿ���ɾ��һ����������.\n"
+"%s 从数据库中删除一个过程语言.\n"
 "\n"
 
-#: droplang.c:335
+#: droplang.c:377
 #, c-format
-msgid "  -d, --dbname=DBNAME       database from which to remove the language\n"
-msgstr "  -d, --dbname=DBNAME       Ҫɾ�����Ե����ݿ�\n"
+msgid ""
+"  -d, --dbname=DBNAME       database from which to remove the language\n"
+msgstr "  -d, --dbname=DBNAME       要删除语言的数据库\n"
 
 #: dropuser.c:103
 msgid "Enter name of role to drop: "
-msgstr "����Ҫɾ�����û���: "
+msgstr "输入要删除的用户名: "
 
 #: dropuser.c:107
 #, c-format
 msgid "Role \"%s\" will be permanently removed.\n"
-msgstr "�û� \"%s\" ��������ɾ��.\n"
+msgstr "用户 \"%s\" 将被永久删除.\n"
 
 #: dropuser.c:123
 #, c-format
 msgid "%s: removal of role \"%s\" failed: %s"
-msgstr "%s: ɾ���û� \"%s\" ʧ��: %s"
+msgstr "%s: 删除用户 \"%s\" 失败: %s"
 
 #: dropuser.c:138
 #, c-format
@@ -630,38 +538,39 @@ msgid ""
 "%s removes a PostgreSQL role.\n"
 "\n"
 msgstr ""
-"%s ɾ��һ�� PostgreSQL �û�.\n"
+"%s 删除一个 PostgreSQL 用户.\n"
 "\n"
 
 #: dropuser.c:149
 #, c-format
-msgid "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
-msgstr "  -U, --username=USERNAME   �����û� (����Ҫɾ�����û���)\n"
+msgid ""
+"  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
+msgstr "  -U, --username=USERNAME   联接用户 (不是要删除的用户名)\n"
 
 #: clusterdb.c:129
 #, c-format
 msgid "%s: cannot cluster all databases and a specific one at the same time\n"
-msgstr "%s: �޷����������ݿ��һ��ָ�������ݿ�ͬʱ����\n"
+msgstr "%s: 无法对所有数据库和一个指定的数据库同时建簇\n"
 
 #: clusterdb.c:135
 #, c-format
 msgid "%s: cannot cluster a specific table in all databases\n"
-msgstr "%s: �޷����������ݿ��ж�һ��ָ���ı����н���\n"
+msgstr "%s: 无法在所有数据库中对一个指定的表进行建簇\n"
 
 #: clusterdb.c:187
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
-msgstr "%1$s: �����ݿ� \"%3$s\" �еı� \"%2$s\" ����ʧ��: %4$s"
+msgstr "%1$s: 在数据库 \"%3$s\" 中的表 \"%2$s\" 建簇失败: %4$s"
 
 #: clusterdb.c:190
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
-msgstr "%s: ���ݿ� \"%s\" ����ʧ��: %s"
+msgstr "%s: 数据库 \"%s\" 建簇失败: %s"
 
 #: clusterdb.c:219
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
-msgstr "%s: �����ݿ� \"%s\" ���н���\n"
+msgstr "%s: 对数据库 \"%s\" 进行建簇\n"
 
 #: clusterdb.c:235
 #, c-format
@@ -669,41 +578,38 @@ msgid ""
 "%s clusters all previously clustered tables in a database.\n"
 "\n"
 msgstr ""
-"%s ��һ�����ݿ�����ǰ�Ѿ������صı����н���.\n"
+"%s 对一个数据库中先前已经建过簇的表进行建簇.\n"
 "\n"
 
-#: clusterdb.c:237
-#: vacuumdb.c:263
-#: reindexdb.c:314
+#: clusterdb.c:237 vacuumdb.c:329 reindexdb.c:314
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
-msgstr "  %s [ѡ��]... [���ݿ���]\n"
+msgstr "  %s [选项]... [数据库名]\n"
 
 #: clusterdb.c:239
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
-msgstr "  -a, --all                 ���������ݿ⽨��\n"
+msgstr "  -a, --all                 对所有数据库建簇\n"
 
 #: clusterdb.c:240
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
-msgstr "  -d, --dbname=DBNAME       �����ݿ� DBNAME ����\n"
+msgstr "  -d, --dbname=DBNAME       对数据库 DBNAME 建簇\n"
 
-#: clusterdb.c:242
-#: reindexdb.c:320
+#: clusterdb.c:242 reindexdb.c:320
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
-msgstr "  -q, --quiet               ��д�κ���Ϣ\n"
+msgstr "  -q, --quiet               不写任何信息\n"
 
 #: clusterdb.c:243
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table only\n"
-msgstr "  -t, --table=TABLE         ֻ��ָ���ı� TABLE ����\n"
+msgstr "  -t, --table=TABLE         只对指定的表 TABLE 建簇\n"
 
 #: clusterdb.c:244
 #, c-format
 msgid "  -v, --verbose             write a lot of output\n"
-msgstr "  -v, --verbose                   ��������\n"
+msgstr "  -v, --verbose                   写大量的输出\n"
 
 #: clusterdb.c:253
 #, c-format
@@ -712,160 +618,180 @@ msgid ""
 "Read the description of the SQL command CLUSTER for details.\n"
 msgstr ""
 "\n"
-"�Ķ� SQL ���� CLUSTER ��������Ϣ, �Ա��ø���ϸ����Ϣ.\n"
+"阅读 SQL 命令 CLUSTER 的描述信息, 以便获得更详细的信息.\n"
+
+#: vacuumdb.c:150
+#, c-format
+msgid "%s: cannot use the \"full\" option when performing only analyze\n"
+msgstr "%s: 在只执行分析的时候，无法使用选项\"full\"\n"
+
+#: vacuumdb.c:156
+#, c-format
+msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
+msgstr "%s: 当只执行分析的时候，无法使用选项\"freeze\"\n"
 
-#: vacuumdb.c:146
+#: vacuumdb.c:169
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
-msgstr "%s: �޷����������ݿ��һ��ָ�������ݿ�ͬʱ����\n"
+msgstr "%s: 无法对所有数据库和一个指定的数据库同时清理\n"
 
-#: vacuumdb.c:152
+#: vacuumdb.c:175
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
-msgstr "%s: �޷����������ݿ��ж�һ��ָ���ı���������\n"
+msgstr "%s: 无法在所有数据库中对一个指定的表进行清理\n"
 
-#: vacuumdb.c:212
+#: vacuumdb.c:278
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
-msgstr "%1$s: �����ݿ� \"%3$s\" �еı� \"%2$s\" ����ʧ��: %4$s"
+msgstr "%1$s: 在数据库 \"%3$s\" 中的表 \"%2$s\" 清理失败: %4$s"
 
-#: vacuumdb.c:215
+#: vacuumdb.c:281
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
-msgstr "%s: ���ݿ� \"%s\" ����ʧ��: %s"
+msgstr "%s: 数据库 \"%s\" 清理失败: %s"
 
-#: vacuumdb.c:245
+#: vacuumdb.c:311
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
-msgstr "%s: �������ݿ� \"%s\"\n"
+msgstr "%s: 清理数据库 \"%s\"\n"
 
-#: vacuumdb.c:261
+#: vacuumdb.c:327
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s ���������Ż�һ�� PostgreSQL ���ݿ�.\n"
+"%s 清理并且优化一个 PostgreSQL 数据库.\n"
 "\n"
 
-#: vacuumdb.c:265
+#: vacuumdb.c:331
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
-msgstr "  -a, --all                       �������е����ݿ�\n"
+msgstr "  -a, --all                       清理所有的数据库\n"
 
-#: vacuumdb.c:266
+#: vacuumdb.c:332
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
-msgstr "  -d, --dbname=DBNAME             �������ݿ� DBNAME\n"
+msgstr "  -d, --dbname=DBNAME             清理数据库 DBNAME\n"
 
-#: vacuumdb.c:267
+#: vacuumdb.c:333
 #, c-format
-msgid "  -e, --echo                      show the commands being sent to the server\n"
-msgstr "  -e, --echo                      ��ʾ���͵�����˵�����\n"
+msgid ""
+"  -e, --echo                      show the commands being sent to the "
+"server\n"
+msgstr "  -e, --echo                      显示发送到服务端的命令\n"
 
-#: vacuumdb.c:268
+#: vacuumdb.c:334
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
-msgstr "  -f, --full                      ��ȫ����\n"
+msgstr "  -f, --full                      完全清理\n"
 
-#: vacuumdb.c:269
+#: vacuumdb.c:335
 #, c-format
 msgid "  -F, --freeze                    freeze row transaction information\n"
-msgstr "  -F, --freeze                    �����¼��������Ϣ\n"
+msgstr "  -F, --freeze                    冻结记录的事务信息\n"
 
-#: vacuumdb.c:270
+#: vacuumdb.c:336
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
-msgstr "  -q, --quiet                     ��д�κ���Ϣ\n"
+msgstr "  -q, --quiet                     不写任何信息\n"
 
-#: vacuumdb.c:271
+#: vacuumdb.c:337
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
-msgstr "  -t, --table='TABLE[(COLUMNS)]'  ֻ����ָ���ı� TABLE\n"
+msgstr "  -t, --table='TABLE[(COLUMNS)]'  只清理指定的表 TABLE\n"
 
-#: vacuumdb.c:272
+#: vacuumdb.c:338
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
-msgstr "  -v, --verbose                   ��������\n"
+msgstr "  -v, --verbose                   写大量的输出\n"
 
-#: vacuumdb.c:273
+#: vacuumdb.c:339
 #, c-format
-msgid "  -z, --analyze                   update optimizer hints\n"
-msgstr "  -z, --anaylze                   �����Ż�����Ϣ\n"
+msgid "  -z, --analyze                   update optimizer statistics\n"
+msgstr "  -z, --anaylze                   更新优化器的统计信息\n"
 
-#: vacuumdb.c:274
+#: vacuumdb.c:340
+#, c-format
+msgid "  -Z, --analyze-only              only update optimizer statistics\n"
+msgstr "  -z, --analyze-only               只更新优化器的统计信息\n"
+
+#: vacuumdb.c:341
 #, c-format
 msgid "  --help                          show this help, then exit\n"
-msgstr "  --help                          ��ʾ�˰�����Ϣ, Ȼ���˳�\n"
+msgstr "  --help                          显示此帮助信息, 然后退出\n"
 
-#: vacuumdb.c:275
+#: vacuumdb.c:342
 #, c-format
-msgid "  --version                       output version information, then exit\n"
-msgstr "  --versoin                       ����汾��Ϣ, Ȼ���˳�\n"
+msgid ""
+"  --version                       output version information, then exit\n"
+msgstr "  --versoin                       输出版本信息, 然后退出\n"
 
-#: vacuumdb.c:282
+#: vacuumdb.c:349
 #, c-format
 msgid ""
 "\n"
 "Read the description of the SQL command VACUUM for details.\n"
 msgstr ""
 "\n"
-"�Ķ� SQL ���� VACUUM ��������Ϣ, �Ա��ø���ϸ����Ϣ.\n"
+"阅读 SQL 命令 VACUUM 的描述信息, 以便获得更详细的信息.\n"
 
 #: reindexdb.c:138
 #, c-format
 msgid "%s: cannot reindex all databases and a specific one at the same time\n"
-msgstr "%s: �޷����������ݿ��һ��ָ��������ͬʱ���������ؽ�����\n"
+msgstr "%s: 无法对所有数据库和一个指定的索引同时进行索引重建操作\n"
 
 #: reindexdb.c:143
 #, c-format
 msgid "%s: cannot reindex all databases and system catalogs at the same time\n"
-msgstr "%s: �޷����������ݿ��ϵͳĿ¼ͬʱ���������ؽ�����\n"
+msgstr "%s: 无法对所有数据库和系统目录同时进行索引重建操作\n"
 
 #: reindexdb.c:148
 #, c-format
 msgid "%s: cannot reindex a specific table in all databases\n"
-msgstr "%s: �޷����������ݿ��ж�һ��ָ�����ϵ����������ؽ�\n"
+msgstr "%s: 无法在所有数据库中对一张指定表上的索引进行重建\n"
 
 #: reindexdb.c:153
 #, c-format
 msgid "%s: cannot reindex a specific index in all databases\n"
-msgstr "%s: �޷����������ݿ��ж�һ��ָ�������������ؽ�\n"
+msgstr "%s: 无法在所有数据库中对一个指定的索引进行重建\n"
 
 #: reindexdb.c:164
 #, c-format
-msgid "%s: cannot reindex a specific table and system catalogs at the same time\n"
-msgstr "%s: �޷���һ��ָ���ı���ϵͳ��ͼͬʱ���������ؽ�����\n"
+msgid ""
+"%s: cannot reindex a specific table and system catalogs at the same time\n"
+msgstr "%s: 无法对一张指定的表和系统视图同时进行索引重建操作\n"
 
 #: reindexdb.c:169
 #, c-format
-msgid "%s: cannot reindex a specific index and system catalogs at the same time\n"
-msgstr "%s: �޷���һ��ָ��������ϵͳ��ͼͬʱ���������ؽ�����\n"
+msgid ""
+"%s: cannot reindex a specific index and system catalogs at the same time\n"
+msgstr "%s: 无法对一个指定索引和系统视图同时进行索引重建操作\n"
 
 #: reindexdb.c:238
 #, c-format
 msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
-msgstr "%1$s: �����ݿ�\"%3$s\"�жԱ�\"%2$s\"�ϵ��������´���ʧ��: %4$s"
+msgstr "%1$s: 在数据库\"%3$s\"中对表\"%2$s\"上的索引重新创建失败: %4$s"
 
 #: reindexdb.c:241
 #, c-format
 msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
-msgstr "%1$s: �����ݿ�\"%3$s\"�ж�����\"%2$s\"���´���ʧ��: %4$s"
+msgstr "%1$s: 在数据库\"%3$s\"中对索引\"%2$s\"重新创建失败: %4$s"
 
 #: reindexdb.c:244
 #, c-format
 msgid "%s: reindexing of database \"%s\" failed: %s"
-msgstr "%s: �����ݿ�\"%s\"�����´�������ʧ��: %s"
+msgstr "%s: 在数据库\"%s\"上重新创建索引失败: %s"
 
 #: reindexdb.c:273
 #, c-format
 msgid "%s: reindexing database \"%s\"\n"
-msgstr "%s: �����ݿ� \"%s\" ���´�������\n"
+msgstr "%s: 对数据库 \"%s\" 重新创建索引\n"
 
 #: reindexdb.c:300
 #, c-format
 msgid "%s: reindexing of system catalogs failed: %s"
-msgstr "%s: ��Ŀ¼��ͼ���´�������ʧ��: %s"
+msgstr "%s: 对目录视图重新创建索引失败: %s"
 
 #: reindexdb.c:312
 #, c-format
@@ -873,33 +799,33 @@ msgid ""
 "%s reindexes a PostgreSQL database.\n"
 "\n"
 msgstr ""
-"%s  ��һ��PostgreSQL ���ݿ����´�������.\n"
+"%s  对一个PostgreSQL 数据库重新创建索引.\n"
 "\n"
 
 #: reindexdb.c:316
 #, c-format
 msgid "  -a, --all                 reindex all databases\n"
-msgstr "  -a, --all                 ���������ݿ�����ؽ���������\n"
+msgstr "  -a, --all                 对所有数据库进行重建索引操作\n"
 
 #: reindexdb.c:317
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to reindex\n"
-msgstr "  -d, --dbname=���ݿ�����       �����ݿ��е����������ؽ�\n"
+msgstr "  -d, --dbname=数据库名称       对数据库中的索引进行重建\n"
 
 #: reindexdb.c:319
 #, c-format
 msgid "  -i, --index=INDEX         recreate specific index only\n"
-msgstr "  -I, --index=��������       �����´���ָ��������\n"
+msgstr "  -I, --index=索引名称       仅重新创建指定的索引\n"
 
 #: reindexdb.c:321
 #, c-format
 msgid "  -s, --system              reindex system catalogs\n"
-msgstr "  -s, --system              ��ϵͳ��ͼ���´�������\n"
+msgstr "  -s, --system              对系统视图重新创建索引\n"
 
 #: reindexdb.c:322
 #, c-format
 msgid "  -t, --table=TABLE         reindex specific table only\n"
-msgstr "  -t, --table=����        ֻ��ָ���ı�TABLE���´�������\n"
+msgstr "  -t, --table=表名        只对指定的表TABLE重新创建索引\n"
 
 #: reindexdb.c:331
 #, c-format
@@ -908,114 +834,114 @@ msgid ""
 "Read the description of the SQL command REINDEX for details.\n"
 msgstr ""
 "\n"
-"�Ķ�SQL����REINDEX��������Ϣ, �Ա��ø���ϸ����Ϣ.\n"
+"阅读SQL命令REINDEX的描述信息, 以便获得更详细的信息.\n"
 
 #: common.c:45
 #, c-format
 msgid "%s: could not obtain information about current user: %s\n"
-msgstr "%s: �޷���õ�ǰ�û�����Ϣ: %s\n"
+msgstr "%s: 无法获得当前用户的信息: %s\n"
 
 #: common.c:56
 #, c-format
 msgid "%s: could not get current user name: %s\n"
-msgstr "%s: �޷���ȡ��ǰ�û�����: %s\n"
+msgstr "%s: 无法获取当前用户名称: %s\n"
 
-#: common.c:103
-#: common.c:127
+#: common.c:103 common.c:155
 msgid "Password: "
-msgstr "����: "
+msgstr "口令: "
+
+#: common.c:117
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: 内存溢出\n"
 
-#: common.c:116
+#: common.c:144
 #, c-format
 msgid "%s: could not connect to database %s\n"
-msgstr "%s: �޷����ӵ����ݿ� %s\n"
+msgstr "%s: 无法联接到数据库 %s\n"
 
-#: common.c:138
+#: common.c:166
 #, c-format
 msgid "%s: could not connect to database %s: %s"
-msgstr "%s: �޷����ӵ����ݿ� %s: %s"
+msgstr "%s: 无法联接到数据库 %s: %s"
 
-#: common.c:162
-#: common.c:190
+#: common.c:190 common.c:218
 #, c-format
 msgid "%s: query failed: %s"
-msgstr "%s: ��ѯʧ��: %s"
+msgstr "%s: 查询失败: %s"
 
-#: common.c:164
-#: common.c:192
+#: common.c:192 common.c:220
 #, c-format
 msgid "%s: query was: %s\n"
-msgstr "%s: ��ѯ��: %s\n"
+msgstr "%s: 查询是: %s\n"
 
 # common.c:78
-#: common.c:238
+#: common.c:266
 #, c-format
 msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
-msgstr "pg_strdup: �޷����ƿ�ָ�� (�ڲ�����)\n"
+msgstr "pg_strdup: 无法复制空指针 (内部错误)\n"
 
-#: common.c:244
+#: common.c:272
 #, c-format
 msgid "out of memory\n"
-msgstr "�ڴ����\n"
+msgstr "内存溢出\n"
 
 #. translator: abbreviation for "yes"
-#: common.c:255
+#: common.c:283
 msgid "y"
 msgstr "y"
 
 #. translator: abbreviation for "no"
-#: common.c:257
+#: common.c:285
 msgid "n"
 msgstr "n"
 
-#: common.c:268
+#: common.c:296
 #, c-format
 msgid "%s (%s/%s) "
 msgstr "%s (%s/%s) "
 
-#: common.c:289
+#: common.c:317
 #, c-format
 msgid "Please answer \"%s\" or \"%s\".\n"
-msgstr "��ش�\"%s\"��\"%s\".\n"
+msgstr "请回答\"%s\"或\"%s\".\n"
 
-#: common.c:367
-#: common.c:400
+#: common.c:395 common.c:428
 #, c-format
 msgid "Cancel request sent\n"
-msgstr "ȡ�����͵�����\n"
+msgstr "取消发送的请求\n"
 
 # fe-connect.c:1322
-#: common.c:369
-#: common.c:402
+#: common.c:397 common.c:430
 #, c-format
 msgid "Could not send cancel request: %s"
-msgstr "�޷�����ȡ������: %s"
+msgstr "无法发送取消请求: %s"
 
 #~ msgid "  -q, --quiet                  don't write any messages\n"
-#~ msgstr "  -q, --quiet                  ��д�κ���Ϣ\n"
+#~ msgstr "  -q, --quiet                  不写任何信息\n"
 
 #~ msgid "%s: unsupported language \"%s\"\n"
-#~ msgstr "%s: ��֧������ \"%s\"\n"
+#~ msgstr "%s: 不支持语言 \"%s\"\n"
 
 #~ msgid ""
 #~ "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
 #~ "plpythonu.\n"
 #~ msgstr ""
-#~ "��֧�ֵ������� plpgsql, pltcl, pltclu, plperl, plperlu, �� plpythonu.\n"
+#~ "已支持的语言有 plpgsql, pltcl, pltclu, plperl, plperlu, 和 plpythonu.\n"
 
 #~ msgid ""
 #~ "  -L, --pglib=DIRECTORY     find language interpreter file in DIRECTORY\n"
-#~ msgstr "  -L, --pglib=DIRECTORY     �� DIRECTORY Ŀ¼�в������Է����ļ�\n"
+#~ msgstr "  -L, --pglib=DIRECTORY     在 DIRECTORY 目录中查找语言翻译文件\n"
 
 #~ msgid "%s: user ID must be a positive number\n"
-#~ msgstr "%s: �û� ID ����Ϊһ������\n"
+#~ msgstr "%s: 用户 ID 必需为一个正数\n"
 
 #~ msgid "  -i, --sysid=SYSID         select sysid for new user\n"
-#~ msgstr "  -i, --sysid=SYSID         ѡ��һ�� sysid �����û�\n"
+#~ msgstr "  -i, --sysid=SYSID         选择一个 sysid 给新用户\n"
 
 #~ msgid "  -W, --password            prompt for password to connect\n"
-#~ msgstr "  -W, --password            ������ʾ��������\n"
+#~ msgstr "  -W, --password            联接提示口令输入\n"
 
 #~ msgid ""
 #~ "  -D, --location=PATH       alternative place to store the database\n"
-#~ msgstr "  -D, --location=PATH       ѡ��һ���ط�������ݿ�\n"
+#~ msgstr "  -D, --location=PATH       选择一个地方存放数据库\n"
diff --git a/src/bin/scripts/po/zh_TW.po b/src/bin/scripts/po/zh_TW.po
new file mode 100644
index 00000000000..dfcdb880e8a
--- /dev/null
+++ b/src/bin/scripts/po/zh_TW.po
@@ -0,0 +1,947 @@
+# 2004-11-11 Zhenbang Wei <forth@zbwei.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 8.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-09-09 16:27+0000\n"
+"PO-Revision-Date: 2010-09-24 17:06-0400\n"
+"Last-Translator: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: createdb.c:114 createdb.c:133 createlang.c:89 createlang.c:110
+#: createlang.c:163 createuser.c:149 createuser.c:164 dropdb.c:83 dropdb.c:92
+#: dropdb.c:100 droplang.c:100 droplang.c:121 droplang.c:175 dropuser.c:83
+#: dropuser.c:98 clusterdb.c:104 clusterdb.c:119 vacuumdb.c:121 vacuumdb.c:136
+#: reindexdb.c:114 reindexdb.c:128
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "執行\"%s --help\"以取得更多資訊。\n"
+
+#: createdb.c:131 createlang.c:108 createuser.c:162 dropdb.c:98 droplang.c:119
+#: dropuser.c:96 clusterdb.c:117 vacuumdb.c:134 reindexdb.c:127
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s：命令列參數過多(第一個是 \"%s\")\n"
+
+#: createdb.c:141
+#, c-format
+msgid "%s: only one of --locale and --lc-ctype can be specified\n"
+msgstr "%s: 只可以指定 --locale 和 --lc-ctype 其中一個\n"
+
+#: createdb.c:147
+#, c-format
+msgid "%s: only one of --locale and --lc-collate can be specified\n"
+msgstr "%s: 只可以指定 --locale 和 --lc-collate 其中一個\n"
+
+#: createdb.c:159
+#, c-format
+msgid "%s: \"%s\" is not a valid encoding name\n"
+msgstr "%s：\"%s\"不是有效的編碼名稱\n"
+
+#: createdb.c:204
+#, c-format
+msgid "%s: database creation failed: %s"
+msgstr "%s：建立資料庫失敗：%s"
+
+#: createdb.c:227
+#, c-format
+msgid "%s: comment creation failed (database was created): %s"
+msgstr "%s：建立註解失敗(資料庫已建立)：%s"
+
+#: createdb.c:244
+#, c-format
+msgid ""
+"%s creates a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s 建立一個PostgreSQL資料庫。\n"
+"\n"
+
+#: createdb.c:245 createlang.c:215 createuser.c:300 dropdb.c:140
+#: droplang.c:332 dropuser.c:139 clusterdb.c:236 vacuumdb.c:262
+#: reindexdb.c:313
+#, c-format
+msgid "Usage:\n"
+msgstr "使用方法:\n"
+
+#: createdb.c:246
+#, c-format
+msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
+msgstr "  %s [選項]... [資料庫名稱] [描述]\n"
+
+#: createdb.c:247 createlang.c:217 createuser.c:302 dropdb.c:142
+#: droplang.c:334 dropuser.c:141 clusterdb.c:238 vacuumdb.c:264
+#: reindexdb.c:315
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"選項:\n"
+
+#: createdb.c:248
+#, c-format
+msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
+msgstr "  -D, --tablespace=TABLESPACE  資料庫的預設tablespace\n"
+
+#: createdb.c:249
+#, c-format
+msgid ""
+"  -e, --echo                   show the commands being sent to the server\n"
+msgstr "  -e, --echo                   顯示被送到伺服器的命令\n"
+
+#: createdb.c:250
+#, c-format
+msgid "  -E, --encoding=ENCODING      encoding for the database\n"
+msgstr "  -E, --encoding=編碼名稱      指定資料庫的編碼\n"
+
+#: createdb.c:251
+#, c-format
+msgid "  -l, --locale=LOCALE          locale settings for the database\n"
+msgstr "  -l, --locale=區域          資料庫的區域設定\n"
+
+#: createdb.c:252
+#, c-format
+msgid "      --lc-collate=LOCALE      LC_COLLATE setting for the database\n"
+msgstr "      --lc-collate=區域      資料庫的 LC_COLLATE 設定\n"
+
+#: createdb.c:253
+#, c-format
+msgid "      --lc-ctype=LOCALE        LC_CTYPE setting for the database\n"
+msgstr "      --lc-ctype=區域        資料庫的 LC_CTYPE 設定\n"
+
+#: createdb.c:254
+#, c-format
+msgid "  -O, --owner=OWNER            database user to own the new database\n"
+msgstr "  -O, --owner=擁有者           指定新資料庫的擁有者\n"
+
+#: createdb.c:255
+#, c-format
+msgid "  -T, --template=TEMPLATE      template database to copy\n"
+msgstr "  -T, --template=樣版名稱      指定要使用的資料庫樣板\n"
+
+#: createdb.c:256
+#, c-format
+msgid "  --help                       show this help, then exit\n"
+msgstr "  --help                       顯示這份說明然後結束\n"
+
+#: createdb.c:257
+#, c-format
+msgid "  --version                    output version information, then exit\n"
+msgstr "  --version                    顯示版本資訊然後結束\n"
+
+#: createdb.c:258 createlang.c:223 createuser.c:321 dropdb.c:147
+#: droplang.c:340 dropuser.c:146 clusterdb.c:247 vacuumdb.c:276
+#: reindexdb.c:325
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"連線選項:\n"
+
+#: createdb.c:259
+#, c-format
+msgid ""
+"  -h, --host=HOSTNAME          database server host or socket directory\n"
+msgstr "  -h, --host=主機名稱          資料庫伺服器主機或socket目錄\n"
+
+#: createdb.c:260
+#, c-format
+msgid "  -p, --port=PORT              database server port\n"
+msgstr "  -p, --port=埠號              資料庫伺服器的埠號\n"
+
+#: createdb.c:261
+#, c-format
+msgid "  -U, --username=USERNAME      user name to connect as\n"
+msgstr "  -U, --username=使用者名稱    用來連線的使用者\n"
+
+#: createdb.c:262
+#, c-format
+msgid "  -w, --no-password            never prompt for password\n"
+msgstr "  -w, --no-password            絕不提示密碼\n"
+
+#: createdb.c:263
+#, c-format
+msgid "  -W, --password               force password prompt\n"
+msgstr "  -W, --password               強制密碼提示\n"
+
+#: createdb.c:264
+#, c-format
+msgid ""
+"\n"
+"By default, a database with the same name as the current user is created.\n"
+msgstr ""
+"\n"
+"預設會建立一個與使用者同名的資料庫。\n"
+
+#: createdb.c:265 createlang.c:229 createuser.c:329 dropdb.c:153
+#: droplang.c:346 dropuser.c:152 clusterdb.c:254 vacuumdb.c:283
+#: reindexdb.c:332
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"回報錯誤至<pgsql-bugs@postgresql.org>。\n"
+
+#: createlang.c:140 droplang.c:151
+msgid "Name"
+msgstr "名稱"
+
+#: createlang.c:141 droplang.c:152
+msgid "yes"
+msgstr "是"
+
+#: createlang.c:141 droplang.c:152
+msgid "no"
+msgstr "否"
+
+#: createlang.c:142 droplang.c:153
+msgid "Trusted?"
+msgstr "是否信任？"
+
+#: createlang.c:151 droplang.c:162
+msgid "Procedural Languages"
+msgstr "程序語言"
+
+#: createlang.c:162 droplang.c:173
+#, c-format
+msgid "%s: missing required argument language name\n"
+msgstr "%s：缺少必要參數語言名稱\n"
+
+#: createlang.c:184
+#, c-format
+msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
+msgstr "%s：語言\"%s\"已經被安裝至資料庫\"%s\"\n"
+
+#: createlang.c:198
+#, c-format
+msgid "%s: language installation failed: %s"
+msgstr "%s：安裝語言失敗：%s"
+
+#: createlang.c:214
+#, c-format
+msgid ""
+"%s installs a procedural language into a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s 安裝了程序語言至PostgreSQL資料庫。\n"
+"\n"
+
+#: createlang.c:216 droplang.c:333
+#, c-format
+msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
+msgstr "  %s [選項]... 語言 [資料庫名稱]\n"
+
+#: createlang.c:218
+#, c-format
+msgid "  -d, --dbname=DBNAME       database to install language in\n"
+msgstr "  -d, --dbname=資料庫名稱       指定要安裝語言的資料庫\n"
+
+#: createlang.c:219 createuser.c:306 dropdb.c:143 droplang.c:336
+#: dropuser.c:142 clusterdb.c:241 reindexdb.c:318
+#, c-format
+msgid ""
+"  -e, --echo                show the commands being sent to the server\n"
+msgstr "  -e, --echo                顯示被送到伺服器的命令\n"
+
+#: createlang.c:220 droplang.c:337
+#, c-format
+msgid ""
+"  -l, --list                show a list of currently installed languages\n"
+msgstr "  -l, --list                顯示目前已安裝的語言\n"
+
+#: createlang.c:221 createuser.c:319 dropdb.c:145 droplang.c:338
+#: dropuser.c:144 clusterdb.c:245 reindexdb.c:323
+#, c-format
+msgid "  --help                    show this help, then exit\n"
+msgstr "  --help                    顯示這份說明然後結束\n"
+
+#: createlang.c:222 createuser.c:320 dropdb.c:146 droplang.c:339
+#: dropuser.c:145 clusterdb.c:246 reindexdb.c:324
+#, c-format
+msgid "  --version                 output version information, then exit\n"
+msgstr "  --version                 顯示版本資訊然後結束\n"
+
+#: createlang.c:224 createuser.c:322 dropdb.c:148 droplang.c:341
+#: dropuser.c:147 clusterdb.c:248 vacuumdb.c:277 reindexdb.c:326
+#, c-format
+msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
+msgstr "  -h, --host=主機名稱       資料庫伺服器的主機或socket目錄\n"
+
+#: createlang.c:225 createuser.c:323 dropdb.c:149 droplang.c:342
+#: dropuser.c:148 clusterdb.c:249 vacuumdb.c:278 reindexdb.c:327
+#, c-format
+msgid "  -p, --port=PORT           database server port\n"
+msgstr "  -p, --port=埠號           資料庫伺服器的埠號\n"
+
+#: createlang.c:226 dropdb.c:150 droplang.c:343 clusterdb.c:250 vacuumdb.c:279
+#: reindexdb.c:328
+#, c-format
+msgid "  -U, --username=USERNAME   user name to connect as\n"
+msgstr "  -U, --username=使用者名稱 用來連線的使用者\n"
+
+#: createlang.c:227 createuser.c:325 dropdb.c:151 droplang.c:344
+#: dropuser.c:150 clusterdb.c:251 vacuumdb.c:280 reindexdb.c:329
+#, c-format
+msgid "  -w, --no-password         never prompt for password\n"
+msgstr "  -w, --no-password         絕不提示密碼\n"
+
+#: createlang.c:228 createuser.c:326 dropdb.c:152 droplang.c:345
+#: dropuser.c:151 clusterdb.c:252 vacuumdb.c:281 reindexdb.c:330
+#, c-format
+msgid "  -W, --password            force password prompt\n"
+msgstr "  -W, --password            強制密碼提示\n"
+
+#: createuser.c:169
+msgid "Enter name of role to add: "
+msgstr "輸入要加入的角色名稱:"
+
+#: createuser.c:176
+msgid "Enter password for new role: "
+msgstr "輸入新角色的密碼:"
+
+#: createuser.c:177
+msgid "Enter it again: "
+msgstr "再輸入一次: "
+
+#: createuser.c:180
+#, c-format
+msgid "Passwords didn't match.\n"
+msgstr "密碼不符。\n"
+
+# utils/misc/guc.c:434
+#: createuser.c:189
+msgid "Shall the new role be a superuser?"
+msgstr "新角色是否要成為超級用戶?"
+
+#: createuser.c:204
+msgid "Shall the new role be allowed to create databases?"
+msgstr "是否允許新角色建立資料庫?"
+
+#: createuser.c:212
+msgid "Shall the new role be allowed to create more new roles?"
+msgstr "是否允許新角色建立更多新角色 ?"
+
+#: createuser.c:245
+#, c-format
+msgid "Password encryption failed.\n"
+msgstr "密碼加密失敗.\n"
+
+#: createuser.c:284
+#, c-format
+msgid "%s: creation of new role failed: %s"
+msgstr "%s: 建立新角色失敗:%s"
+
+#: createuser.c:299
+#, c-format
+msgid ""
+"%s creates a new PostgreSQL role.\n"
+"\n"
+msgstr ""
+"%s 會建立新的 PostgreSQL 角色。\n"
+"\n"
+
+#: createuser.c:301 dropuser.c:140
+#, c-format
+msgid "  %s [OPTION]... [ROLENAME]\n"
+msgstr "  %s [OPTION]...[ROLENAME]\n"
+
+#: createuser.c:303
+#, c-format
+msgid ""
+"  -c, --connection-limit=N  connection limit for role (default: no limit)\n"
+msgstr "  -c, --connection-limit=N  角色的連線限制 (預設: 無限制)\n"
+
+#: createuser.c:304
+#, c-format
+msgid "  -d, --createdb            role can create new databases\n"
+msgstr "  -d, --createdb            角色可以建立新資料庫\n"
+
+#: createuser.c:305
+#, c-format
+msgid "  -D, --no-createdb         role cannot create databases\n"
+msgstr "  -D, --no-createdb         角色無法建立資料庫\n"
+
+#: createuser.c:307
+#, c-format
+msgid "  -E, --encrypted           encrypt stored password\n"
+msgstr "  -E, --encrypted           加密儲存的密碼\n"
+
+#: createuser.c:308
+#, c-format
+msgid ""
+"  -i, --inherit             role inherits privileges of roles it is a\n"
+"                            member of (default)\n"
+msgstr ""
+"  -i, --inherit             角色會繼承父角色的\n"
+"                            權限 (預設)\n"
+
+#: createuser.c:310
+#, c-format
+msgid "  -I, --no-inherit          role does not inherit privileges\n"
+msgstr "  -I, --no-inherit          角色不會繼承權限\n"
+
+#: createuser.c:311
+#, c-format
+msgid "  -l, --login               role can login (default)\n"
+msgstr "  -l, --login               角色可以登入 (預設)\n"
+
+#: createuser.c:312
+#, c-format
+msgid "  -L, --no-login            role cannot login\n"
+msgstr "  -L, --no-login            角色不能登入\n"
+
+#: createuser.c:313
+#, c-format
+msgid "  -N, --unencrypted         do not encrypt stored password\n"
+msgstr "  -N, --unencrypted         不加密儲存的密碼\n"
+
+#: createuser.c:314
+#, c-format
+msgid "  -P, --pwprompt            assign a password to new role\n"
+msgstr "  -P, --pwprompt            指派密碼給新角色\n"
+
+#: createuser.c:315
+#, c-format
+msgid "  -r, --createrole          role can create new roles\n"
+msgstr "  -r, --createrole          角色可以建立新角色\n"
+
+#: createuser.c:316
+#, c-format
+msgid "  -R, --no-createrole       role cannot create roles\n"
+msgstr "  -R, --no-createrole       角色不能建立角色\n"
+
+#: createuser.c:317
+#, c-format
+msgid "  -s, --superuser           role will be superuser\n"
+msgstr "  -s, --superuser           角色會是超級用戶\n"
+
+#: createuser.c:318
+#, c-format
+msgid "  -S, --no-superuser        role will not be superuser\n"
+msgstr "  -S, --no-superuser        角色不會是超級用戶\n"
+
+#: createuser.c:324
+#, c-format
+msgid ""
+"  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
+msgstr "  -U, --username=使用者名稱 用來連線的使用者(不是要建立的)\n"
+
+#: createuser.c:327
+#, c-format
+msgid ""
+"\n"
+"If one of -d, -D, -r, -R, -s, -S, and ROLENAME is not specified, you will\n"
+"be prompted interactively.\n"
+msgstr ""
+"\n"
+"如果 -d、-D、-r、-R、-s、-S 和 ROLENAME 其中一個未指定，系統會\n"
+"以互動方式提示您輸入。\n"
+
+#: dropdb.c:91
+#, c-format
+msgid "%s: missing required argument database name\n"
+msgstr "%s：缺少必要參數資料庫名稱\n"
+
+#: dropdb.c:106
+#, c-format
+msgid "Database \"%s\" will be permanently removed.\n"
+msgstr "資料庫\"%s\"會被永久刪除。\n"
+
+#: dropdb.c:107 dropuser.c:108
+msgid "Are you sure?"
+msgstr "您確定嗎?"
+
+#: dropdb.c:124
+#, c-format
+msgid "%s: database removal failed: %s"
+msgstr "%s：刪除資料庫失敗：%s"
+
+#: dropdb.c:139
+#, c-format
+msgid ""
+"%s removes a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s 刪除了一個PostgreSQL資料庫。\n"
+"\n"
+
+#: dropdb.c:141
+#, c-format
+msgid "  %s [OPTION]... DBNAME\n"
+msgstr "  %s [選項]... 資料庫名稱\n"
+
+#: dropdb.c:144 dropuser.c:143
+#, c-format
+msgid "  -i, --interactive         prompt before deleting anything\n"
+msgstr "  -i, --interactive         刪除任何東西前要先詢問\n"
+
+#: droplang.c:203
+#, c-format
+msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
+msgstr "%s：語言\"%s\"未被安裝至資料庫\"%s\"\n"
+
+#: droplang.c:223
+#, c-format
+msgid ""
+"%s: still %s functions declared in language \"%s\"; language not removed\n"
+msgstr "%s：仍有 %s 個函式以語言\"%s\"宣告，不予刪除\n"
+
+#: droplang.c:316
+#, c-format
+msgid "%s: language removal failed: %s"
+msgstr "%s：刪除語言失敗：%s"
+
+#: droplang.c:331
+#, c-format
+msgid ""
+"%s removes a procedural language from a database.\n"
+"\n"
+msgstr ""
+"%s 刪除了一個資料庫中的程序語言。\n"
+"\n"
+
+#: droplang.c:335
+#, c-format
+msgid ""
+"  -d, --dbname=DBNAME       database from which to remove the language\n"
+msgstr "  -d, --dbname=資料庫名稱   指定要刪除語言的資料庫\n"
+
+#: dropuser.c:103
+msgid "Enter name of role to drop: "
+msgstr "輸入要捨棄之角色的名稱:"
+
+#: dropuser.c:107
+#, c-format
+msgid "Role \"%s\" will be permanently removed.\n"
+msgstr "角色 \"%s\" 將會永久移除。\n"
+
+#: dropuser.c:123
+#, c-format
+msgid "%s: removal of role \"%s\" failed: %s"
+msgstr "%s: 移除角色 \"%s\" 失敗:%s"
+
+#: dropuser.c:138
+#, c-format
+msgid ""
+"%s removes a PostgreSQL role.\n"
+"\n"
+msgstr ""
+"%s 會移除 PostgreSQL 角色。\n"
+"\n"
+
+#: dropuser.c:149
+#, c-format
+msgid ""
+"  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
+msgstr "  -U, --username=使用者名稱 用來連線的使用者(不是要刪除的)\n"
+
+#: clusterdb.c:129
+#, c-format
+msgid "%s: cannot cluster all databases and a specific one at the same time\n"
+msgstr "%s：不能同時重新排列所有資料庫和重新排列指定資料庫\n"
+
+#: clusterdb.c:135
+#, c-format
+msgid "%s: cannot cluster a specific table in all databases\n"
+msgstr "%s：不能對所有資料庫指定重新排列資料表\n"
+
+#: clusterdb.c:187
+#, c-format
+msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
+msgstr "%s：重新排列資料表\"%s\"於資料庫\"%s\"失敗：%s"
+
+#: clusterdb.c:190
+#, c-format
+msgid "%s: clustering of database \"%s\" failed: %s"
+msgstr "%s：重新排列資料庫\"%s\"失敗: %s"
+
+#: clusterdb.c:219
+#, c-format
+msgid "%s: clustering database \"%s\"\n"
+msgstr "%s：重新排列資料庫\"%s\"\n"
+
+#: clusterdb.c:235
+#, c-format
+msgid ""
+"%s clusters all previously clustered tables in a database.\n"
+"\n"
+msgstr ""
+"%s 重新排列所有資料庫中曾經重排的資料庫。\n"
+"\n"
+
+#: clusterdb.c:237 vacuumdb.c:263 reindexdb.c:314
+#, c-format
+msgid "  %s [OPTION]... [DBNAME]\n"
+msgstr "  %s [選項]... [資料庫名稱]\n"
+
+#: clusterdb.c:239
+#, c-format
+msgid "  -a, --all                 cluster all databases\n"
+msgstr "  -a, --all                 重新排列所有資料庫\n"
+
+#: clusterdb.c:240
+#, c-format
+msgid "  -d, --dbname=DBNAME       database to cluster\n"
+msgstr "  -d, --dbname=資料庫名稱   重新排列指定的資料庫\n"
+
+#: clusterdb.c:242 reindexdb.c:320
+#, c-format
+msgid "  -q, --quiet               don't write any messages\n"
+msgstr "  -q, --quiet               不顯示任何訊息\n"
+
+#: clusterdb.c:243
+#, c-format
+msgid "  -t, --table=TABLE         cluster specific table only\n"
+msgstr "  -t, --table=資料表名稱    重新排列指定的資料表\n"
+
+#: clusterdb.c:244
+#, c-format
+msgid "  -v, --verbose             write a lot of output\n"
+msgstr "  -v, --verbose             顯示詳細的執行訊息\n"
+
+#: clusterdb.c:253
+#, c-format
+msgid ""
+"\n"
+"Read the description of the SQL command CLUSTER for details.\n"
+msgstr ""
+"\n"
+"請參考SQL命令CLUSTER的說明。\n"
+
+#: vacuumdb.c:146
+#, c-format
+msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
+msgstr "%s：不能同時重整所有資料庫和重整指定資料庫\n"
+
+#: vacuumdb.c:152
+#, c-format
+msgid "%s: cannot vacuum a specific table in all databases\n"
+msgstr "%s：不能對所有資料庫指定重整資料表\n"
+
+#: vacuumdb.c:212
+#, c-format
+msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
+msgstr "%s：重整資料表\"%s\"於資料庫\"%s\"失敗：%s"
+
+#: vacuumdb.c:215
+#, c-format
+msgid "%s: vacuuming of database \"%s\" failed: %s"
+msgstr "%s：重整資料庫\"%s\"失敗：%s"
+
+#: vacuumdb.c:245
+#, c-format
+msgid "%s: vacuuming database \"%s\"\n"
+msgstr "%s：重整資料庫\"%s\"\n"
+
+#: vacuumdb.c:261
+#, c-format
+msgid ""
+"%s cleans and analyzes a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s 清理並分析PostgreSQL資料庫。\n"
+"\n"
+
+#: vacuumdb.c:265
+#, c-format
+msgid "  -a, --all                       vacuum all databases\n"
+msgstr "  -a, --all                       重整所有資料庫\n"
+
+#: vacuumdb.c:266
+#, c-format
+msgid "  -d, --dbname=DBNAME             database to vacuum\n"
+msgstr "  -d, --dbname=資料庫名稱         重整指定的資料庫\n"
+
+#: vacuumdb.c:267
+#, c-format
+msgid ""
+"  -e, --echo                      show the commands being sent to the "
+"server\n"
+msgstr "  -e, --echo                      顯示被送到伺服器的命令\n"
+
+#: vacuumdb.c:268
+#, c-format
+msgid "  -f, --full                      do full vacuuming\n"
+msgstr "  -f, --full                      進行完整的資料庫重整\n"
+
+#: vacuumdb.c:269
+#, c-format
+msgid "  -F, --freeze                    freeze row transaction information\n"
+msgstr "  -F, --freeze                    凍結資料列交易資訊\n"
+
+#: vacuumdb.c:270
+#, c-format
+msgid "  -q, --quiet                     don't write any messages\n"
+msgstr "  -q, --quiet                     不顯示任何訊息\n"
+
+#: vacuumdb.c:271
+#, c-format
+msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
+msgstr "  -t, --table='資料表名稱[(欄位)]' 重整指定的資料表\n"
+
+#: vacuumdb.c:272
+#, c-format
+msgid "  -v, --verbose                   write a lot of output\n"
+msgstr "  -v, --verbose                   顯示詳細的執行訊息\n"
+
+#: vacuumdb.c:273
+#, c-format
+msgid "  -z, --analyze                   update optimizer hints\n"
+msgstr "  -z, --analyze                   更新效能調整器統計資料\n"
+
+#: vacuumdb.c:274
+#, c-format
+msgid "  --help                          show this help, then exit\n"
+msgstr "  --help                          顯示這份說明然後結束\n"
+
+#: vacuumdb.c:275
+#, c-format
+msgid ""
+"  --version                       output version information, then exit\n"
+msgstr "  --version                       顯示版本資訊然後結束\n"
+
+#: vacuumdb.c:282
+#, c-format
+msgid ""
+"\n"
+"Read the description of the SQL command VACUUM for details.\n"
+msgstr ""
+"\n"
+"請參考SQL命令VACUUM的說明。\n"
+
+#: reindexdb.c:138
+#, c-format
+msgid "%s: cannot reindex all databases and a specific one at the same time\n"
+msgstr "%s: 無法同時對所有資料庫和特定資料庫進行索引重建\n"
+
+#: reindexdb.c:143
+#, c-format
+msgid "%s: cannot reindex all databases and system catalogs at the same time\n"
+msgstr "%s: 無法同時對所有資料庫和系統目錄進行索引重建\n"
+
+#: reindexdb.c:148
+#, c-format
+msgid "%s: cannot reindex a specific table in all databases\n"
+msgstr "%s: 無法對所有資料庫中的特定資料表進行索引重建\n"
+
+#: reindexdb.c:153
+#, c-format
+msgid "%s: cannot reindex a specific index in all databases\n"
+msgstr "%s: 無法對所有資料庫中的特定索引進行索引重建\n"
+
+#: reindexdb.c:164
+#, c-format
+msgid ""
+"%s: cannot reindex a specific table and system catalogs at the same time\n"
+msgstr "%s: 無法同時對特定資料表和系統目錄進行索引重建\n"
+
+#: reindexdb.c:169
+#, c-format
+msgid ""
+"%s: cannot reindex a specific index and system catalogs at the same time\n"
+msgstr "%s: 無法同時對特定索引和系統目錄進行索引重建\n"
+
+#: reindexdb.c:238
+#, c-format
+msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
+msgstr "%s: 對資料表 \"%s\" (位於資料庫 \"%s\" 中) 進行索引重建失敗:%s"
+
+#: reindexdb.c:241
+#, c-format
+msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
+msgstr "%s: 對索引 \"%s\" (位於資料庫 \"%s\" 中) 進行索引重建失敗:%s"
+
+#: reindexdb.c:244
+#, c-format
+msgid "%s: reindexing of database \"%s\" failed: %s"
+msgstr "%s: 對資料庫 \"%s\" 進行索引重建失敗:%s"
+
+#: reindexdb.c:273
+#, c-format
+msgid "%s: reindexing database \"%s\"\n"
+msgstr "%s: 對資料庫 \"%s\" 進行索引重建\n"
+
+#: reindexdb.c:300
+#, c-format
+msgid "%s: reindexing of system catalogs failed: %s"
+msgstr "%s: 對系統目錄進行索引重建失敗:%s"
+
+#: reindexdb.c:312
+#, c-format
+msgid ""
+"%s reindexes a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s 會對 PostgreSQL 資料庫進行索引重建。\n"
+"\n"
+
+#: reindexdb.c:316
+#, c-format
+msgid "  -a, --all                 reindex all databases\n"
+msgstr "  -a, --all                 對所有資料庫進行索引重建\n"
+
+#: reindexdb.c:317
+#, c-format
+msgid "  -d, --dbname=DBNAME       database to reindex\n"
+msgstr "  -d, --dbname=資料庫名稱       要進行索引重建的資料庫\n"
+
+#: reindexdb.c:319
+#, c-format
+msgid "  -i, --index=INDEX         recreate specific index only\n"
+msgstr "  -i, --index=索引         只重新建立特定索引\n"
+
+#: reindexdb.c:321
+#, c-format
+msgid "  -s, --system              reindex system catalogs\n"
+msgstr "  -s, --system              對系統目錄進行索引重建\n"
+
+#: reindexdb.c:322
+#, c-format
+msgid "  -t, --table=TABLE         reindex specific table only\n"
+msgstr "  -t, --table=資料表         只對特定資料表進行索引重建\n"
+
+#: reindexdb.c:331
+#, c-format
+msgid ""
+"\n"
+"Read the description of the SQL command REINDEX for details.\n"
+msgstr ""
+"\n"
+"請閱讀 SQL 指令 REINDEX 的描述以取得詳細資訊。\n"
+
+#: common.c:45
+#, c-format
+msgid "%s: could not obtain information about current user: %s\n"
+msgstr "%s：無法取得目前使用者的資訊：%s\n"
+
+#: common.c:56
+#, c-format
+msgid "%s: could not get current user name: %s\n"
+msgstr "%s：無法取得目前使用者的名稱：%s\n"
+
+#: common.c:103 common.c:127
+msgid "Password: "
+msgstr "密碼："
+
+#: common.c:116
+#, c-format
+msgid "%s: could not connect to database %s\n"
+msgstr "%s：無法連線至資料庫 %s\n"
+
+#: common.c:138
+#, c-format
+msgid "%s: could not connect to database %s: %s"
+msgstr "%s：無法連線至資料庫 %s：%s"
+
+#: common.c:162 common.c:190
+#, c-format
+msgid "%s: query failed: %s"
+msgstr "%s：查詢失敗：%s"
+
+#: common.c:164 common.c:192
+#, c-format
+msgid "%s: query was: %s\n"
+msgstr "%s：查詢是：%s\n"
+
+# common.c:78
+#: common.c:238
+#, c-format
+msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
+msgstr "pg_strdup: 無法複製 Null 指標 (內部錯誤)\n"
+
+# commands/sequence.c:798 executor/execGrouping.c:328
+# executor/execGrouping.c:388 executor/nodeIndexscan.c:1051 lib/dllist.c:43
+# lib/dllist.c:88 libpq/auth.c:637 postmaster/pgstat.c:1006
+# postmaster/pgstat.c:1023 postmaster/pgstat.c:2452 postmaster/pgstat.c:2527
+# postmaster/pgstat.c:2572 postmaster/pgstat.c:2623
+# postmaster/postmaster.c:755 postmaster/postmaster.c:1625
+# postmaster/postmaster.c:2344 storage/buffer/localbuf.c:139
+# storage/file/fd.c:587 storage/file/fd.c:620 storage/file/fd.c:766
+# storage/ipc/sinval.c:789 storage/lmgr/lock.c:497 storage/smgr/md.c:138
+# storage/smgr/md.c:848 storage/smgr/smgr.c:213 utils/adt/cash.c:297
+# utils/adt/cash.c:312 utils/adt/oracle_compat.c:73
+# utils/adt/oracle_compat.c:124 utils/adt/regexp.c:191
+# utils/adt/ri_triggers.c:3471 utils/cache/relcache.c:164
+# utils/cache/relcache.c:178 utils/cache/relcache.c:1130
+# utils/cache/typcache.c:165 utils/cache/typcache.c:487
+# utils/fmgr/dfmgr.c:127 utils/fmgr/fmgr.c:521 utils/fmgr/fmgr.c:532
+# utils/init/miscinit.c:213 utils/init/miscinit.c:234
+# utils/init/miscinit.c:244 utils/misc/guc.c:1898 utils/misc/guc.c:1911
+# utils/misc/guc.c:1924 utils/mmgr/aset.c:337 utils/mmgr/aset.c:503
+# utils/mmgr/aset.c:700 utils/mmgr/aset.c:893 utils/mmgr/portalmem.c:75
+#: common.c:244
+#, c-format
+msgid "out of memory\n"
+msgstr "記憶體用盡\n"
+
+#  translator: Make sure the (y/n) prompts match the translation of this.
+#. translator: abbreviation for "yes"
+#: common.c:255
+msgid "y"
+msgstr "y"
+
+#  translator: Make sure the (y/n) prompts match the translation of this.
+#. translator: abbreviation for "no"
+#: common.c:257
+msgid "n"
+msgstr "n"
+
+#: common.c:268
+#, c-format
+msgid "%s (%s/%s) "
+msgstr "%s (%s/%s) "
+
+#: common.c:289
+#, c-format
+msgid "Please answer \"%s\" or \"%s\".\n"
+msgstr "請回應 \"%s\" 或 \"%s\"。\n"
+
+#: common.c:367 common.c:400
+#, c-format
+msgid "Cancel request sent\n"
+msgstr "取消要求已傳送\n"
+
+# fe-connect.c:1427
+#: common.c:369 common.c:402
+#, c-format
+msgid "Could not send cancel request: %s"
+msgstr "無法傳送取消要求:%s"
+
+msgid ""
+"Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
+"plpythonu.\n"
+msgstr "支援的語言有plpgsql、pltcl、pltclu、plperl、plperlu和plpythonu。\n"
+
+msgid ""
+"  -L, --pglib=DIRECTORY     find language interpreter file in DIRECTORY\n"
+msgstr "  -L, --pglib=目錄          在指定的目錄中尋找語言直譯器檔案\n"
+
+msgid "%s: user ID must be a positive number\n"
+msgstr "%s：使用者ID必須是正數\n"
+
+#, fuzzy
+#~ msgid "  -q, --quiet                  don't write any messages\n"
+#~ msgstr "  -q, --quiet                     不顯示任何訊息\n"
+
+#, fuzzy
+#~ msgid "%s: unsupported language \"%s\"\n"
+#~ msgstr "%s：重新排列資料庫\"%s\"\n"
+
+#, fuzzy
+#~ msgid "  -i, --sysid=SYSID         select sysid for new user\n"
+#~ msgstr "  -i, --index=索引         只重新建立特定索引\n"
+
+#, fuzzy
+#~ msgid "  -W, --password            prompt for password to connect\n"
+#~ msgstr "  -w, --no-password            絕不提示密碼\n"